Commit 08ec0a2a authored by Jonathan Perkin's avatar Jonathan Perkin

Try again..

parent 736f2eae
...@@ -175,7 +175,6 @@ FUNCTION(INSTALL_DEBUG_TARGET target) ...@@ -175,7 +175,6 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
${ARGN} ${ARGN}
) )
GET_TARGET_PROPERTY(target_type ${target} TYPE) GET_TARGET_PROPERTY(target_type ${target} TYPE)
GET_TARGET_PROPERTY(target_permissions ${target} PERMISSIONS)
IF(ARG_RENAME) IF(ARG_RENAME)
SET(RENAME_PARAM RENAME ${ARG_RENAME}${CMAKE_${target_type}_SUFFIX}) SET(RENAME_PARAM RENAME ${ARG_RENAME}${CMAKE_${target_type}_SUFFIX})
ELSE() ELSE()
...@@ -184,6 +183,11 @@ FUNCTION(INSTALL_DEBUG_TARGET target) ...@@ -184,6 +183,11 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
IF(NOT ARG_DESTINATION) IF(NOT ARG_DESTINATION)
MESSAGE(FATAL_ERROR "Need DESTINATION parameter for INSTALL_DEBUG_TARGET") MESSAGE(FATAL_ERROR "Need DESTINATION parameter for INSTALL_DEBUG_TARGET")
ENDIF() ENDIF()
IF(target_type MATCHES "EXECUTABLE")
SET(INSTALL_TYPE TARGETS)
ELSE()
SET(INSTALL_TYPE FILES)
ENDIF()
GET_TARGET_PROPERTY(target_location ${target} LOCATION) GET_TARGET_PROPERTY(target_location ${target} LOCATION)
IF(CMAKE_GENERATOR MATCHES "Makefiles") IF(CMAKE_GENERATOR MATCHES "Makefiles")
STRING(REPLACE "${CMAKE_BINARY_DIR}" "${DEBUGBUILDDIR}" debug_target_location "${target_location}") STRING(REPLACE "${CMAKE_BINARY_DIR}" "${DEBUGBUILDDIR}" debug_target_location "${target_location}")
...@@ -191,10 +195,9 @@ FUNCTION(INSTALL_DEBUG_TARGET target) ...@@ -191,10 +195,9 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
STRING(REPLACE "${CMAKE_CFG_INTDIR}" "Debug" debug_target_location "${target_location}" ) STRING(REPLACE "${CMAKE_CFG_INTDIR}" "Debug" debug_target_location "${target_location}" )
ENDIF() ENDIF()
INSTALL(FILES ${debug_target_location} INSTALL(${INSTALL_TYPE} ${debug_target_location}
DESTINATION ${ARG_DESTINATION} DESTINATION ${ARG_DESTINATION}
${RENAME_PARAM} ${RENAME_PARAM}
PERMISSIONS ${target_permissions}
CONFIGURATIONS Release RelWithDebInfo CONFIGURATIONS Release RelWithDebInfo
OPTIONAL) OPTIONAL)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment