Fix gcc32bit compilation.

Push BUILD_INTERNAL_UNIT_TESTS to the precompiler definitions Minor adjustments
IntelRealSense · Aug 26, 2019 · ee0e499 · ee0e499
1 parent 2123f40
commit ee0e499
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/CMake/global_config.cmake b/CMake/global_config.cmake
@@ -53,6 +53,10 @@ macro(global_set_flags)
         add_definitions(-DRS2_USE_CUDA)
     endif()
 
+    if (BUILD_INTERNAL_UNIT_TESTS)
+        add_definitions(-DBUILD_INTERNAL_UNIT_TESTS)
+    endif()
+
     if(FORCE_LIBUVC)
         set(BACKEND RS2_USE_LIBUVC_BACKEND)
         message(STATUS "Using libuvc (by force)")

diff --git a/common/tiny-profiler.h b/common/tiny-profiler.h
@@ -3,6 +3,7 @@
 #include <unordered_map>
 #include <chrono>
 #include <iostream>
+#include <cstring> // strlen
 
 class scoped_timer
 {

diff --git a/unit-tests/internal/CMakeLists.txt b/unit-tests/internal/CMakeLists.txt
@@ -9,7 +9,7 @@ set (INTERNAL_TESTS_SOURCES
     internal-tests-main.cpp
     internal-tests-usb.cpp
     internal-tests-extrinsic.cpp
-	internal-tests-types.cpp
+    internal-tests-types.cpp
 )
 
 add_executable(${PROJECT_NAME} ${INTERNAL_TESTS_SOURCES})

diff --git a/unit-tests/internal/internal-tests-types.cpp b/unit-tests/internal/internal-tests-types.cpp
@@ -1,5 +1,5 @@
 // License: Apache 2.0. See LICENSE file in root directory.
-// Copyright(c) 2015 Intel Corporation. All Rights Reserved.
+// Copyright(c) 2019 Intel Corporation. All Rights Reserved.
 
 #include "catch/catch.hpp"
 #include <cmath>