Skip to content
Permalink
Browse files

Merge pull request #2150 from nyalldawson/fix_cmake_warnings

Fix cmake warnings under Win32
  • Loading branch information
jef-n committed Jun 19, 2015
2 parents a316290 + a0c04d1 commit 705eb74ec53b5fcb39f0125e91276fe0b5904fa2
Showing with 5 additions and 2 deletions.
  1. +4 −0 CMakeLists.txt
  2. +1 −2 cmake/SIPMacros.cmake
@@ -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")
@@ -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)

0 comments on commit 705eb74

Please sign in to comment.
You can’t perform that action at this time.