diff options
| author | vvaintroub <vvaintroub@w7> | 2009-12-09 03:13:38 +0100 |
|---|---|---|
| committer | vvaintroub <vvaintroub@w7> | 2009-12-09 03:13:38 +0100 |
| commit | 0e28e588b9cbb5ed81ca163f1a5c3c225d992265 (patch) | |
| tree | ddd364aa90c20d6f5d4b89d095cab6e6f16c54d9 /cmake/install_macros.cmake | |
| parent | ef482374e556a2a022ad2668bf386a30023c05b6 (diff) | |
| download | mariadb-git-0e28e588b9cbb5ed81ca163f1a5c3c225d992265.tar.gz | |
Use CMAKE_CFG_INTDIR instead of different MSVC and Xcode specific
configuration names
Diffstat (limited to 'cmake/install_macros.cmake')
| -rw-r--r-- | cmake/install_macros.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index 81fc44c6a15..3a5529efc15 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -30,8 +30,7 @@ MACRO (INSTALL_DEBUG_SYMBOLS targets) STRING(REPLACE ".exe" ".pdb" pdb_location ${location}) STRING(REPLACE ".dll" ".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 "$(ConfigurationName)" "\${CMAKE_INSTALL_CONFIG_NAME}" pdb_location ${pdb_location}) + STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}" pdb_location ${pdb_location}) INSTALL(FILES ${pdb_location} DESTINATION ${INSTALL_LOCATION}) ENDFOREACH() ENDIF() @@ -62,7 +61,7 @@ IF(UNIX) DEPENDS ${output}) SET_TARGET_PROPERTIES(symlink_${linkbasename}${ext} PROPERTIES CLEAN_DIRECT_OUTPUT 1) # 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}) ENDIF() ENDMACRO() |