Change cmake runtime output dir, add extensions lib for windows

orbbec · Jul 9, 2024 · 250b330 · 250b330
1 parent cdd97c4
commit 250b330
Show file tree

Hide file tree

Showing 43 changed files with 11 additions and 49 deletions.
diff --git a/3rdparty/live555/src/CMakeLists.txt b/3rdparty/live555/src/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 cmake_minimum_required(VERSION 3.5)
 project(Live555 LANGUAGES CXX C)
 

diff --git a/cmake/global_config.cmake b/cmake/global_config.cmake
@@ -7,17 +7,17 @@ endif()
 
 # output directories
 string(TOLOWER ${CMAKE_BUILD_TYPE} OB_BUILD_TYPE)
-set(OB_OUTPUT_DIRECTORY_ROOT ${CMAKE_BINARY_DIR}/${OB_CURRENT_OS}/${OB_BUILD_TYPE})
+set(OB_OUTPUT_DIRECTORY_ROOT ${CMAKE_BINARY_DIR}/${OB_CURRENT_OS})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OB_OUTPUT_DIRECTORY_ROOT}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OB_OUTPUT_DIRECTORY_ROOT}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OB_OUTPUT_DIRECTORY_ROOT}/bin)
 if(MSVC)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OB_CURRENT_OS}/debug/bin")
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OB_CURRENT_OS}/release/bin")
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OB_CURRENT_OS}/debug/lib")
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OB_CURRENT_OS}/release/lib")
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OB_CURRENT_OS}/debug/lib")
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OB_CURRENT_OS}/release/lib")
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OB_CURRENT_OS}/bin")
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OB_CURRENT_OS}/bin")
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OB_CURRENT_OS}/lib")
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OB_CURRENT_OS}/lib")
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OB_CURRENT_OS}/lib")
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OB_CURRENT_OS}/lib")
 endif()
 
 # set install prefix to binary directory if not specified

diff --git a/examples/0.basic.enumerate/CMakeLists.txt b/examples/0.basic.enumerate/CMakeLists.txt
@@ -1,5 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
-
 cmake_minimum_required(VERSION 3.5)
 project(ob_enumerate)
 

diff --git a/examples/0.basic.enumerate/CMakeLists_publish.txt b/examples/0.basic.enumerate/CMakeLists_publish.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(Sample-PostProcessing)

diff --git a/examples/0.basic.quick_start/CMakeLists.txt b/examples/0.basic.quick_start/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(ob_quick_start)

diff --git a/examples/1.stream.callback/CMakeLists.txt b/examples/1.stream.callback/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(ob_callback)

diff --git a/examples/1.stream.color/CMakeLists.txt b/examples/1.stream.color/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(ob_color)

diff --git a/examples/1.stream.color/CMakeLists_publish.txt b/examples/1.stream.color/CMakeLists_publish.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(Sample-ColorViewer)

diff --git a/examples/1.stream.depth/CMakeLists_publish.txt b/examples/1.stream.depth/CMakeLists_publish.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(Sample-DepthViewer)

diff --git a/examples/1.stream.imu/CMakeLists_publish.txt b/examples/1.stream.imu/CMakeLists_publish.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(Sample-ImuReader)

diff --git a/examples/1.stream.infrared/CMakeLists.txt b/examples/1.stream.infrared/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(ob_infrared)

diff --git a/examples/1.stream.infrared/CMakeLists_publish.txt b/examples/1.stream.infrared/CMakeLists_publish.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(Sample-InfraredViewer)

diff --git a/examples/2.device.control/CMakeLists.txt b/examples/2.device.control/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(ob_device_control)

diff --git a/examples/2.device.control/CMakeLists_publish.txt b/examples/2.device.control/CMakeLists_publish.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(Sample-SensorControl)

diff --git a/examples/2.device.hot_plugin/CMakeLists.txt b/examples/2.device.hot_plugin/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(ob_hot_plugin)

diff --git a/examples/2.device.hot_plugin/CMakeLists_publish.txt b/examples/2.device.hot_plugin/CMakeLists_publish.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(Sample-HotPlugin)

diff --git a/examples/2.device.net_device/CMakeLists.txt b/examples/2.device.net_device/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(ob_net_device)

diff --git a/examples/2.device.net_device/CMakeLists_publish.txt b/examples/2.device.net_device/CMakeLists_publish.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(Sample-NetDevice)

diff --git a/examples/3.advanced.common_usages/CMakeLists.txt b/examples/3.advanced.common_usages/CMakeLists.txt
@@ -1,6 +1,4 @@
-#  minimum required cmake version: 3.1.15 support vs2019
-
-cmake_minimum_required(VERSION 3.1.15)
+cmake_minimum_required(VERSION 3.5)
 project(ob_common_usages)
 
 add_executable(${PROJECT_NAME} common_usages.cpp)

diff --git a/examples/3.advanced.hdr/CMakeLists_publish.txt b/examples/3.advanced.hdr/CMakeLists_publish.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(Sample-HdrMerge)

diff --git a/examples/3.advanced.point_cloud/CMakeLists_publish.txt b/examples/3.advanced.point_cloud/CMakeLists_publish.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(Sample-PointCloud)

diff --git a/examples/3.advanced.post_processing/CMakeLists_publish.txt b/examples/3.advanced.post_processing/CMakeLists_publish.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(Sample-PostProcessing)

diff --git a/examples/3.advanced.preset/CMakeLists_publish.txt b/examples/3.advanced.preset/CMakeLists_publish.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(Sample-PostProcessing)

diff --git a/examples/3.advanced.sync_align/CMakeLists.txt b/examples/3.advanced.sync_align/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(ob_sync_align)

diff --git a/examples/3.advanced.sync_align/CMakeLists_publish.txt b/examples/3.advanced.sync_align/CMakeLists_publish.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 
 cmake_minimum_required(VERSION 3.5)
 project(Sample-Align)

diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt
@@ -1,16 +1,16 @@
 cmake_minimum_required(VERSION 3.5)
 
-add_custom_target(extensions)
+add_custom_target(extensions ALL)
 
 add_custom_command(
     TARGET extensions
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_LIST_DIR}/filters/${OB_CURRENT_OS}" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/extensions/filters")
 
-
 add_custom_command(
     TARGET extensions
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_LIST_DIR}/frameprocessor/${OB_CURRENT_OS}" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/extensions/frameprocessor")
 
+
 set_target_properties(extensions PROPERTIES FOLDER "modules")
diff --git a/extensions/filters/win_x64/FilterProcessor.dll b/extensions/filters/win_x64/FilterProcessor.dll
diff --git a/extensions/filters/win_x64/empty b/extensions/filters/win_x64/empty
diff --git a/extensions/filters/win_x64/ob_priv_filter.dll b/extensions/filters/win_x64/ob_priv_filter.dll
diff --git a/extensions/frameprocessor/win_x64/empty b/extensions/frameprocessor/win_x64/empty
diff --git a/extensions/frameprocessor/win_x64/ob_frame_processor.dll b/extensions/frameprocessor/win_x64/ob_frame_processor.dll
diff --git a/src/device/component/sensor/CMakeLists.txt b/src/device/component/sensor/CMakeLists.txt
@@ -1,5 +1,4 @@
-##  minimum required cmake version: 3.5 support vs2019
-cmake_minimum_required(VERSION 3.5)
+#cmake_minimum_required(VERSION 3.5)
 
 target_sources(${OB_TARGET_DEVICE} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/SensorBase.cpp ${CMAKE_CURRENT_LIST_DIR}/SensorBase.hpp)
 

diff --git a/src/device/component/sensor/motion/CMakeLists.txt b/src/device/component/sensor/motion/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 cmake_minimum_required(VERSION 3.5)
 
 file (GLOB _cpp_files "${CMAKE_CURRENT_LIST_DIR}/*.cpp")

diff --git a/src/device/component/sensor/video/CMakeLists.txt b/src/device/component/sensor/video/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 cmake_minimum_required(VERSION 3.5)
 
 target_sources(${OB_TARGET_DEVICE} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/VideoSensor.cpp ${CMAKE_CURRENT_LIST_DIR}/VideoSensor.hpp)
diff --git a/src/device/protocol/CMakeLists.txt b/src/device/protocol/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 cmake_minimum_required(VERSION 3.5)
 
 target_sources(${OB_TARGET_DEVICE} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/Protocol.cpp ${CMAKE_CURRENT_LIST_DIR}/Protocol.hpp)
diff --git a/src/platform/pal/CMakeLists.txt b/src/platform/pal/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 cmake_minimum_required(VERSION 3.5)
 
 if(OB_BUILD_WIN32)

diff --git a/src/platform/pal/linux/CMakeLists.txt b/src/platform/pal/linux/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 cmake_minimum_required(VERSION 3.5)
 
 

diff --git a/src/platform/pal/mac/CMakeLists.txt b/src/platform/pal/mac/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 cmake_minimum_required(VERSION 3.5)
 
 

diff --git a/src/platform/pal/win/CMakeLists.txt b/src/platform/pal/win/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 cmake_minimum_required(VERSION 3.5)
 
 file(GLOB PAL_SOURCES ${CMAKE_CURRENT_LIST_DIR}/WinPal.*)

diff --git a/src/platform/usb/CMakeLists.txt b/src/platform/usb/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 cmake_minimum_required(VERSION 3.5)
 
 add_subdirectory(backend)

diff --git a/src/platform/usb/backend/CMakeLists.txt b/src/platform/usb/backend/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 cmake_minimum_required(VERSION 3.5)
 
 

diff --git a/src/platform/usb/hid/CMakeLists.txt b/src/platform/usb/hid/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 cmake_minimum_required(VERSION 3.5)
 
 if(OB_BUILD_WIN32)

diff --git a/src/platform/usb/vendor/CMakeLists.txt b/src/platform/usb/vendor/CMakeLists.txt
@@ -1,4 +1,3 @@
-#  minimum required cmake version: 3.5 support vs2019
 cmake_minimum_required(VERSION 3.5)
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@
		# minimum required cmake version: 3.5 support vs2019
		cmake_minimum_required(VERSION 3.5)


Expand Down