Merge pull request #6891 from ev-mp/win_cmake_fix

Adjust windows cmake build to v3.6+
IntelRealSense · Jul 22, 2020 · 305fd80 · 305fd80
2 parents 2b28b79 + 55adad0
commit 305fd80
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/CMake/windows_config.cmake b/CMake/windows_config.cmake
@@ -1,5 +1,5 @@
 message(STATUS "Setting Windows configurations")
-
+cmake_minimum_required(VERSION 3.6.0) #Required by list(FILTER ...
 config_crt()
 
 macro(os_set_flags)
@@ -89,3 +89,12 @@ macro(os_target_config)
         source_group("Source Files\\${_file_path_msvc}" FILES "${_relative_file}")
     endforeach()
 endmacro()
+
+#modify variable with prefix. Mimics list(TRANSFORM ... PREPEND introduced with cmake 3.12
+FUNCTION(PREPEND var prefix)
+   SET(listVar "")
+   FOREACH(f ${ARGN})
+      LIST(APPEND listVar "${prefix}/${f}")
+   ENDFOREACH(f)
+   SET(${var} "${listVar}" PARENT_SCOPE)
+ENDFUNCTION(PREPEND)
diff --git a/tools/depth-quality/CMakeLists.txt b/tools/depth-quality/CMakeLists.txt
@@ -78,7 +78,9 @@ if(BUILD_GRAPHICAL_EXAMPLES)
                                              ../../third-party/tinyfiledialogs
                                              ${CMAKE_CURRENT_SOURCE_DIR}/res/)
 
-        list(TRANSFORM DELAYED PREPEND " /DELAYLOAD:")
+        #list(TRANSFORM DELAYED PREPEND " /DELAYLOAD:")
+        PREPEND(DELAYED " /DELAYLOAD:" ${DELAYED})
+        #infoValue(DELAYED)
         string(REPLACE ";" " " LD_FLAGS_STR "${DELAYED}")
         set_target_properties(rs-depth-quality PROPERTIES LINK_FLAGS "${LD_FLAGS_STR}")
 

diff --git a/tools/realsense-viewer/CMakeLists.txt b/tools/realsense-viewer/CMakeLists.txt
@@ -162,7 +162,8 @@ if(WIN32)
 
     source_group("OpenVINO" FILES ${OPENVINO_FILES})
 
-    list(TRANSFORM DELAYED PREPEND " /DELAYLOAD:")
+    #list(TRANSFORM DELAYED PREPEND " /DELAYLOAD:")  - Requires cmake v3.12
+    PREPEND(DELAYED " /DELAYLOAD:" ${DELAYED})
     string(REPLACE ";" " " LD_FLAGS_STR "${DELAYED}")
     set_target_properties(realsense-viewer PROPERTIES LINK_FLAGS "${LD_FLAGS_STR}")