Commit 962d3fb9 authored by vvaintroub's avatar vvaintroub

Use CMAKE_CFG_INTDIR instead of different MSVC and Xcode specific

configuration names
parent b5761e63
...@@ -30,8 +30,7 @@ MACRO (INSTALL_DEBUG_SYMBOLS targets) ...@@ -30,8 +30,7 @@ MACRO (INSTALL_DEBUG_SYMBOLS targets)
STRING(REPLACE ".exe" ".pdb" pdb_location ${location}) STRING(REPLACE ".exe" ".pdb" pdb_location ${location})
STRING(REPLACE ".dll" ".pdb" pdb_location ${pdb_location}) STRING(REPLACE ".dll" ".pdb" pdb_location ${pdb_location})
STRING(REPLACE ".lib" ".pdb" pdb_location ${pdb_location}) STRING(REPLACE ".lib" ".pdb" pdb_location ${pdb_location})
STRING(REPLACE "$(OutDir)" "\${CMAKE_INSTALL_CONFIG_NAME}" pdb_location ${pdb_location}) STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}" pdb_location ${pdb_location})
STRING(REPLACE "$(ConfigurationName)" "\${CMAKE_INSTALL_CONFIG_NAME}" pdb_location ${pdb_location})
INSTALL(FILES ${pdb_location} DESTINATION ${INSTALL_LOCATION}) INSTALL(FILES ${pdb_location} DESTINATION ${INSTALL_LOCATION})
ENDFOREACH() ENDFOREACH()
ENDIF() ENDIF()
...@@ -62,7 +61,7 @@ IF(UNIX) ...@@ -62,7 +61,7 @@ IF(UNIX)
DEPENDS ${output}) DEPENDS ${output})
SET_TARGET_PROPERTIES(symlink_${linkbasename}${ext} PROPERTIES CLEAN_DIRECT_OUTPUT 1) SET_TARGET_PROPERTIES(symlink_${linkbasename}${ext} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
# For Xcode, replace project config with install config # For Xcode, replace project config with install config
STRING(REPLACE "$(CONFIGURATION)" "\${CMAKE_INSTALL_CONFIG_NAME}" output ${output}) STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}" output ${output})
INSTALL(FILES ${output} DESTINATION ${destination}) INSTALL(FILES ${output} DESTINATION ${destination})
ENDIF() ENDIF()
ENDMACRO() ENDMACRO()
......
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