Fossil SCM
Fix the MSVC specific link flags.
Commit
27c4e7b02d6d90a232aa98b10ef91719bd6883119142acdf0c156f3d9469e543
Parent
ad12f35c98ac6ee…
1 file changed
+11
-8
+11
-8
| --- CMakeLists.txt | ||
| +++ CMakeLists.txt | ||
| @@ -215,18 +215,21 @@ | ||
| 215 | 215 | |
| 216 | 216 | set_target_properties(app PROPERTIES |
| 217 | 217 | OUTPUT_NAME "${app_NAME}" |
| 218 | 218 | RUNTIME_OUTPUT_DIRECTORY "${app_DIR}" |
| 219 | 219 | ) |
| 220 | -set_target_properties(app PROPERTIES | |
| 221 | - LINK_FLAGS "/INCREMENTAL:NO /MANIFEST:NO" | |
| 222 | -) | |
| 223 | -if(MSVC AND isDebugBuild) | |
| 224 | - set_target_properties(app PROPERTIES | |
| 225 | - PDB_NAME "${app_NAME}" | |
| 226 | - ) | |
| 227 | -endif() | |
| 220 | +if(MSVC) | |
| 221 | + set_target_properties(app PROPERTIES | |
| 222 | + LINK_FLAGS "/INCREMENTAL:NO /MANIFEST:NO" | |
| 223 | + ) | |
| 224 | + if(isDebugBuild) | |
| 225 | + set_target_properties(app PROPERTIES | |
| 226 | + PDB_NAME "${app_NAME}" | |
| 227 | + ) | |
| 228 | + endif() | |
| 229 | +endif() | |
| 230 | + | |
| 228 | 231 | add_custom_command(TARGET app PRE_LINK |
| 229 | 232 | COMMAND "${CMAKE_COMMAND}" -E chdir "$<TARGET_FILE_DIR:app>" |
| 230 | 233 | "${CMAKE_COMMAND}" -E rename "$<TARGET_FILE_NAME:app>" |
| 231 | 234 | "$<TARGET_FILE_NAME:app>-imported" |
| 232 | 235 | ) |
| 233 | 236 |
| --- CMakeLists.txt | |
| +++ CMakeLists.txt | |
| @@ -215,18 +215,21 @@ | |
| 215 | |
| 216 | set_target_properties(app PROPERTIES |
| 217 | OUTPUT_NAME "${app_NAME}" |
| 218 | RUNTIME_OUTPUT_DIRECTORY "${app_DIR}" |
| 219 | ) |
| 220 | set_target_properties(app PROPERTIES |
| 221 | LINK_FLAGS "/INCREMENTAL:NO /MANIFEST:NO" |
| 222 | ) |
| 223 | if(MSVC AND isDebugBuild) |
| 224 | set_target_properties(app PROPERTIES |
| 225 | PDB_NAME "${app_NAME}" |
| 226 | ) |
| 227 | endif() |
| 228 | add_custom_command(TARGET app PRE_LINK |
| 229 | COMMAND "${CMAKE_COMMAND}" -E chdir "$<TARGET_FILE_DIR:app>" |
| 230 | "${CMAKE_COMMAND}" -E rename "$<TARGET_FILE_NAME:app>" |
| 231 | "$<TARGET_FILE_NAME:app>-imported" |
| 232 | ) |
| 233 |
| --- CMakeLists.txt | |
| +++ CMakeLists.txt | |
| @@ -215,18 +215,21 @@ | |
| 215 | |
| 216 | set_target_properties(app PROPERTIES |
| 217 | OUTPUT_NAME "${app_NAME}" |
| 218 | RUNTIME_OUTPUT_DIRECTORY "${app_DIR}" |
| 219 | ) |
| 220 | if(MSVC) |
| 221 | set_target_properties(app PROPERTIES |
| 222 | LINK_FLAGS "/INCREMENTAL:NO /MANIFEST:NO" |
| 223 | ) |
| 224 | if(isDebugBuild) |
| 225 | set_target_properties(app PROPERTIES |
| 226 | PDB_NAME "${app_NAME}" |
| 227 | ) |
| 228 | endif() |
| 229 | endif() |
| 230 | |
| 231 | add_custom_command(TARGET app PRE_LINK |
| 232 | COMMAND "${CMAKE_COMMAND}" -E chdir "$<TARGET_FILE_DIR:app>" |
| 233 | "${CMAKE_COMMAND}" -E rename "$<TARGET_FILE_NAME:app>" |
| 234 | "$<TARGET_FILE_NAME:app>-imported" |
| 235 | ) |
| 236 |