Merge pull request #2150 from nyalldawson/fix_cmake_warnings

Fix cmake warnings under Win32
qgis · Jun 19, 2015 · 705eb74 · 705eb74
2 parents a316290 + a0c04d1
commit 705eb74
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -816,6 +816,10 @@ ADD_CUSTOM_TARGET(uninstall
 #############################################################
 # Enable packaging
 
+# Do not warn about runtime libs when building using VS Express
+IF(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
+  SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
+ENDIF()
 INCLUDE(InstallRequiredSystemLibraries)
 
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "QGIS")

diff --git a/cmake/SIPMacros.cmake b/cmake/SIPMacros.cmake
@@ -128,11 +128,10 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
     ENDIF (WIN32)
 
     IF(WIN32)
-      GET_TARGET_PROPERTY(_target_location ${_logical_name} LOCATION)
       GET_TARGET_PROPERTY(_runtime_output ${_logical_name} RUNTIME_OUTPUT_DIRECTORY)
       ADD_CUSTOM_COMMAND(TARGET ${_logical_name} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E echo "Copying extension ${_child_module_name}"
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_target_location}" "${_runtime_output}/${_child_module_name}.pyd"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:${_logical_name}>" "${_runtime_output}/${_child_module_name}.pyd"
         DEPENDS ${_logical_name}
       )
     ENDIF(WIN32)