Fossil SCM
Change the order of extra build flags to allow overrides.
Commit
f59ccb03a84a22d89955755ba5fb576472d7e5296f0227f32eab262b7826e703
Parent
b7430ba100f68f9…
1 file changed
+3
-3
+3
-3
| --- CMakeLists.txt | ||
| +++ CMakeLists.txt | ||
| @@ -152,15 +152,15 @@ | ||
| 152 | 152 | ExternalProject_Add(fossil |
| 153 | 153 | PREFIX fossil |
| 154 | 154 | SOURCE_DIR "${fossil_SOURCE_DIR}" |
| 155 | 155 | CONFIGURE_COMMAND "" |
| 156 | 156 | BINARY_DIR "${fossil_BINARY_DIR}" |
| 157 | - BUILD_COMMAND "${fossil_SOURCE_DIR}/win/buildmsvc.bat" all install | |
| 157 | + BUILD_COMMAND "${fossil_SOURCE_DIR}/win/buildmsvc.bat" | |
| 158 | 158 | ${fossil_configure_FLAGS} |
| 159 | - DESTDIR=${fossil_DESTDIR} | |
| 160 | 159 | ${fossil_build_FLAGS} |
| 161 | - VERBATIM | |
| 160 | + all | |
| 161 | + install DESTDIR=${fossil_DESTDIR} | |
| 162 | 162 | INSTALL_COMMAND "" |
| 163 | 163 | STEP_TARGETS configure build install |
| 164 | 164 | ) |
| 165 | 165 | |
| 166 | 166 | else(MSVC) |
| 167 | 167 |
| --- CMakeLists.txt | |
| +++ CMakeLists.txt | |
| @@ -152,15 +152,15 @@ | |
| 152 | ExternalProject_Add(fossil |
| 153 | PREFIX fossil |
| 154 | SOURCE_DIR "${fossil_SOURCE_DIR}" |
| 155 | CONFIGURE_COMMAND "" |
| 156 | BINARY_DIR "${fossil_BINARY_DIR}" |
| 157 | BUILD_COMMAND "${fossil_SOURCE_DIR}/win/buildmsvc.bat" all install |
| 158 | ${fossil_configure_FLAGS} |
| 159 | DESTDIR=${fossil_DESTDIR} |
| 160 | ${fossil_build_FLAGS} |
| 161 | VERBATIM |
| 162 | INSTALL_COMMAND "" |
| 163 | STEP_TARGETS configure build install |
| 164 | ) |
| 165 | |
| 166 | else(MSVC) |
| 167 |
| --- CMakeLists.txt | |
| +++ CMakeLists.txt | |
| @@ -152,15 +152,15 @@ | |
| 152 | ExternalProject_Add(fossil |
| 153 | PREFIX fossil |
| 154 | SOURCE_DIR "${fossil_SOURCE_DIR}" |
| 155 | CONFIGURE_COMMAND "" |
| 156 | BINARY_DIR "${fossil_BINARY_DIR}" |
| 157 | BUILD_COMMAND "${fossil_SOURCE_DIR}/win/buildmsvc.bat" |
| 158 | ${fossil_configure_FLAGS} |
| 159 | ${fossil_build_FLAGS} |
| 160 | all |
| 161 | install DESTDIR=${fossil_DESTDIR} |
| 162 | INSTALL_COMMAND "" |
| 163 | STEP_TARGETS configure build install |
| 164 | ) |
| 165 | |
| 166 | else(MSVC) |
| 167 |