created WITH_JS cmake option that disables dependencies

Signed-off-by: Timotei Molcut <[email protected]>
analogdevicesinc · Mar 22, 2022 · 8eca33a · 8eca33a
1 parent 9054d22
commit 8eca33a
Show file tree

Hide file tree

Showing 64 changed files with 343 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,6 +36,7 @@ option(USE_FXTOF1 "Use FXTOF1 camera?" OFF)
 option(USE_3D_SMART "Use 3D Smart camera?" OFF)
 option(WITH_TOOLS "Build tools?" OFF)
 option(IGNORE_TARGET_VERSION "Ignore sdk version on target?" OFF)
+option(WITH_JS "Build JavaScript bindings?" OFF)
 
 # Set camera flags
 if (USE_FXTOF1)
@@ -78,6 +79,15 @@ if (ON_TARGET)
     if(${SELECTED_CAMERAS} GREATER 1)
     message(FATAL_ERROR "More than one camera was selected. \nPlease select a single camera. CMake will exit.")
     endif()
+
+    if(WITH_JS)
+        message(FATAL_ERROR "Target does not support JavaScript bindings.")
+    endif()
+endif()
+
+if (WITH_JS)
+    set(WITH_NETWORK OFF)
+    add_definitions(-DJS_BINDINGS)
 endif()
 
 if (WITH_NETWORK)

diff --git a/bindings/matlab/aditofimaq.h b/bindings/matlab/aditofimaq.h
@@ -35,7 +35,11 @@
 #include <aditof/camera.h>
 #include <aditof/frame.h>
 #include <aditof/system.h>
+#ifndef JS_BINDINGS
 #include <glog/logging.h>
+#else
+#include <aditof/log_cout.h>
+#endif
 
 #include <iostream>
 

diff --git a/bindings/open3D/showPointCloud/main.cpp b/bindings/open3D/showPointCloud/main.cpp
@@ -32,7 +32,11 @@
 #include <aditof/camera.h>
 #include <aditof/frame.h>
 #include <aditof/system.h>
+#ifndef JS_BINDINGS
 #include <glog/logging.h>
+#else
+#include <aditof/log_cout.h>
+#endif
 
 #include "../aditof_open3d.h"
 
@@ -43,8 +47,10 @@ static const uint8_t colormap[3 * 256] = {
 using namespace aditof;
 
 int main(int argc, char *argv[]) {
+#ifndef JS_BINDINGS 
     google::InitGoogleLogging(argv[0]);
     FLAGS_alsologtostderr = 1;
+#endif
 
     Status status = Status::OK;
 

diff --git a/bindings/opencv/dnn/main.cpp b/bindings/opencv/dnn/main.cpp
@@ -32,7 +32,11 @@
 #include <aditof/camera.h>
 #include <aditof/frame.h>
 #include <aditof/system.h>
+#ifndef JS_BINDINGS
 #include <glog/logging.h>
+#else
+#include <aditof/log_cout.h>
+#endif
 
 #include <opencv2/dnn.hpp>
 #include <opencv2/dnn/shape_utils.hpp>
@@ -66,8 +70,10 @@ int main(int argc, char *argv[]) {
 
     cv::dnn::Net net = cv::dnn::readNetFromCaffe(PROTOTXT, MODEL);
 
+#ifndef JS_BINDINGS 
     google::InitGoogleLogging(argv[0]);
     FLAGS_alsologtostderr = 1;
+#endif
 
     Status status = Status::OK;
 

diff --git a/bindings/opencv/imshow/main.cpp b/bindings/opencv/imshow/main.cpp
@@ -33,7 +33,11 @@
 #include <aditof/depth_sensor_interface.h>
 #include <aditof/frame.h>
 #include <aditof/system.h>
+#ifndef JS_BINDINGS
 #include <glog/logging.h>
+#else
+#include <aditof/log_cout.h>
+#endif
 
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
@@ -46,8 +50,10 @@
 using namespace aditof;
 
 int main(int argc, char *argv[]) {
+#ifndef JS_BINDINGS 
     google::InitGoogleLogging(argv[0]);
     FLAGS_alsologtostderr = 1;
+#endif
 
     Status status = Status::OK;
 

diff --git a/bindings/opencv/maskrcnn/main.cpp b/bindings/opencv/maskrcnn/main.cpp
@@ -32,7 +32,11 @@
 #include <aditof/camera.h>
 #include <aditof/frame.h>
 #include <aditof/system.h>
+#ifndef JS_BINDINGS
 #include <glog/logging.h>
+#else
+#include <aditof/log_cout.h>
+#endif
 
 #include <fstream>
 #include <iostream>

diff --git a/bindings/ros/aditof_roscpp/include/aditof_roscpp/aditof_utils.h b/bindings/ros/aditof_roscpp/include/aditof_roscpp/aditof_utils.h
@@ -33,7 +33,11 @@
 #define ADITOF_UTILS_H
 
 #include <aditof/camera.h>
+#ifndef JS_BINDINGS
 #include <glog/logging.h>
+#else
+#include <aditof/log_cout.h>
+#endif
 #include <mutex>
 
 std::string parseArgs(int argc, char **argv);

diff --git a/bindings/ros/aditof_roscpp/include/aditof_roscpp/cameraInfo_msg.h b/bindings/ros/aditof_roscpp/include/aditof_roscpp/cameraInfo_msg.h
@@ -36,7 +36,11 @@
 #include <string>
 
 #include <aditof/frame.h>
+#ifndef JS_BINDINGS
 #include <glog/logging.h>
+#else
+#include <aditof/log_cout.h>
+#endif
 
 #include "aditof_sensor_msg.h"
 #include "aditof_utils.h"

diff --git a/bindings/ros/aditof_roscpp/src/aditof_utils.cpp b/bindings/ros/aditof_roscpp/src/aditof_utils.cpp
@@ -40,8 +40,10 @@ std::mutex mtx_dynamic_rec;
 using namespace aditof;
 
 std::string parseArgs(int argc, char **argv) {
+#ifndef JS_BINDINGS
     google::InitGoogleLogging(argv[0]);
     FLAGS_alsologtostderr = 1;
+#endif
 
     if (argc > 1) {
         std::string ip = argv[1];

diff --git a/examples/aditof-demo-imgui/aditofdemocontroller.cpp b/examples/aditof-demo-imgui/aditofdemocontroller.cpp
@@ -33,7 +33,11 @@
 
 #include <aditof/depth_sensor_interface.h>
 #include <aditof/temperature_sensor_interface.h>
+#ifndef JS_BINDINGS
 #include <glog/logging.h>
+#else
+#include <aditof/log_cout.h>
+#endif
 #include <iostream>
 
 AdiTofDemoController::AdiTofDemoController()

diff --git a/examples/aditof-demo-imgui/main.cpp b/examples/aditof-demo-imgui/main.cpp
@@ -31,13 +31,19 @@
  */
 
 #include "view.h"
+#ifndef JS_BINDINGS
 #include <glog/logging.h>
+#else
+#include <aditof/log_cout.h>
+#endif
 
 int main(int argc, char **argv) {
 
     // Init google logging system
+#ifndef JS_BINDINGS 
     google::InitGoogleLogging(argv[0]);
     FLAGS_alsologtostderr = 1;
+#endif
 
     auto view =
         std::make_shared<View>();

diff --git a/examples/aditof-demo-imgui/view.cpp b/examples/aditof-demo-imgui/view.cpp
@@ -41,7 +41,11 @@
 #include "imgui_impl_opengl3.h"
 
 #include <aditof/version.h>
+#ifndef JS_BINDINGS
 #include <glog/logging.h>
+#else
+#include <aditof/log_cout.h>
+#endif
 #include <stdio.h>
 #include <string>
 

diff --git a/examples/aditof-demo/aditofdemocontroller.cpp b/examples/aditof-demo/aditofdemocontroller.cpp
@@ -33,7 +33,11 @@
 
 #include <aditof/depth_sensor_interface.h>
 #include <aditof/temperature_sensor_interface.h>
+#ifndef JS_BINDINGS
 #include <glog/logging.h>
+#else
+#include <aditof/log_cout.h>
+#endif
 #include <iostream>
 
 AdiTofDemoController::AdiTofDemoController()

diff --git a/examples/aditof-demo/aditofdemoview.cpp b/examples/aditof-demo/aditofdemoview.cpp
@@ -31,7 +31,11 @@
  */
 #include "aditofdemoview.h"
 
+#ifndef JS_BINDINGS
 #include <glog/logging.h>
+#else
+#include <aditof/log_cout.h>
+#endif
 #include <sstream>
 
 #define CVUI_IMPLEMENTATION

diff --git a/examples/aditof-demo/main.cpp b/examples/aditof-demo/main.cpp
@@ -32,14 +32,20 @@
 #include "aditofdemocontroller.h"
 #include "aditofdemoview.h"
 #include <aditof/version.h>
+#ifndef JS_BINDINGS
 #include <glog/logging.h>
+#else
+#include <aditof/log_cout.h>
+#endif
 #include <iostream>
 
 int main(int argc, char **argv) {
 
     // Init google logging system
+#ifndef JS_BINDINGS 
     google::InitGoogleLogging(argv[0]);
     FLAGS_alsologtostderr = 1;
+#endif
 
     std::string version = aditof::getApiVersion();
     auto controller = std::make_shared<AdiTofDemoController>();

diff --git a/examples/first-frame-network/main.cpp b/examples/first-frame-network/main.cpp
@@ -32,15 +32,21 @@
 #include <aditof/camera.h>
 #include <aditof/frame.h>
 #include <aditof/system.h>
+#ifndef JS_BINDINGS
 #include <glog/logging.h>
+#else
+#include <aditof/log_cout.h>
+#endif
 #include <iostream>
 
 using namespace aditof;
 
 int main(int argc, char *argv[]) {
 
+#ifndef JS_BINDINGS 
     google::InitGoogleLogging(argv[0]);
     FLAGS_alsologtostderr = 1;
+#endif
 
     Status status = Status::OK;
 

diff --git a/examples/first-frame/main.cpp b/examples/first-frame/main.cpp
@@ -32,15 +32,21 @@
 #include <aditof/camera.h>
 #include <aditof/frame.h>
 #include <aditof/system.h>
+#ifndef JS_BINDINGS
 #include <glog/logging.h>
+#else
+#include <aditof/log_cout.h>
+#endif
 #include <iostream>
 
 using namespace aditof;
 
 int main(int argc, char *argv[]) {
 
+#ifndef JS_BINDINGS 
     google::InitGoogleLogging(argv[0]);
     FLAGS_alsologtostderr = 1;
+#endif
 
     Status status = Status::OK;
 

diff --git a/examples/imshow-xavier/main.cpp b/examples/imshow-xavier/main.cpp
@@ -33,7 +33,11 @@
 #include <aditof/camera.h>
 #include <aditof/frame.h>
 #include <aditof/system.h>
+#ifndef JS_BINDINGS
 #include <glog/logging.h>
+#else
+#include <aditof/log_cout.h>
+#endif
 
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
@@ -82,8 +86,10 @@ aditof::Status fromFrameToIrMat(aditof::Frame &frame, cv::Mat &mat) {
 }
 
 int main(int argc, char *argv[]) {
+#ifndef JS_BINDINGS 
     google::InitGoogleLogging(argv[0]);
     FLAGS_alsologtostderr = 1;
+#endif
 
     Status status = Status::OK;
     System system;

diff --git a/sdk/CMakeLists.txt b/sdk/CMakeLists.txt
@@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 2.8)
 project(aditof)
 
 add_definitions(-DSDK_EXPORTS)
-find_package(glog 0.3.5 REQUIRED)
+if (NOT WITH_JS)
+    find_package(glog 0.3.5 REQUIRED)
+endif()
 
 #Enables the use of assert() from <assert.h> only in Debug mode.
 if ( NOT CMAKE_BUILD_TYPE STREQUAL "Debug" )
@@ -157,19 +159,21 @@ set_target_properties( ${PROJECT_NAME} PROPERTIES
                        CXX_STANDARD 11
 )
 
-if ( WITH_NETWORK )
-    target_link_libraries( ${PROJECT_NAME}
-        PUBLIC
-            glog::glog
-        PRIVATE
-            ${Protobuf_LIBRARIES}
-            ${LIBWEBSOCKETS_LIBRARIES}
-    )
-else()
-    target_link_libraries( ${PROJECT_NAME}
-        PUBLIC
-            glog::glog
-    )
+if (NOT WITH_JS)
+    if ( WITH_NETWORK )
+        target_link_libraries( ${PROJECT_NAME}
+            PUBLIC
+                glog::glog
+            PRIVATE
+                ${Protobuf_LIBRARIES}
+                ${LIBWEBSOCKETS_LIBRARIES}
+        )
+    else()
+        target_link_libraries( ${PROJECT_NAME}
+            PUBLIC
+                glog::glog
+        )
+    endif()    
 endif()
 
 if (CMAKE_COMPILER_IS_GNUCC)

diff --git a/sdk/include/aditof/log_cout.h b/sdk/include/aditof/log_cout.h
@@ -0,0 +1,38 @@
+/*
+ * BSD 3-Clause License
+ *
+ * Copyright (c) 2019, Analog Devices, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <iostream>
+
+#define INFO "INFO "
+#define ERROR "ERROR "
+#define WARNING "WARNING "
+#define LOG(x) std::cout << x
+#define DLOG(x) std::cout << x