diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/common/settings.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index b1e0ba6cc..68436a4bc 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt | |||
| @@ -19,7 +19,7 @@ find_package(Git QUIET) | |||
| 19 | 19 | ||
| 20 | add_custom_command(OUTPUT scm_rev.cpp | 20 | add_custom_command(OUTPUT scm_rev.cpp |
| 21 | COMMAND ${CMAKE_COMMAND} | 21 | COMMAND ${CMAKE_COMMAND} |
| 22 | -DSRC_DIR=${CMAKE_SOURCE_DIR} | 22 | -DSRC_DIR=${PROJECT_SOURCE_DIR} |
| 23 | -DBUILD_REPOSITORY=${BUILD_REPOSITORY} | 23 | -DBUILD_REPOSITORY=${BUILD_REPOSITORY} |
| 24 | -DTITLE_BAR_FORMAT_IDLE=${TITLE_BAR_FORMAT_IDLE} | 24 | -DTITLE_BAR_FORMAT_IDLE=${TITLE_BAR_FORMAT_IDLE} |
| 25 | -DTITLE_BAR_FORMAT_RUNNING=${TITLE_BAR_FORMAT_RUNNING} | 25 | -DTITLE_BAR_FORMAT_RUNNING=${TITLE_BAR_FORMAT_RUNNING} |
| @@ -31,13 +31,13 @@ add_custom_command(OUTPUT scm_rev.cpp | |||
| 31 | -DGIT_BRANCH=${GIT_BRANCH} | 31 | -DGIT_BRANCH=${GIT_BRANCH} |
| 32 | -DBUILD_FULLNAME=${BUILD_FULLNAME} | 32 | -DBUILD_FULLNAME=${BUILD_FULLNAME} |
| 33 | -DGIT_EXECUTABLE=${GIT_EXECUTABLE} | 33 | -DGIT_EXECUTABLE=${GIT_EXECUTABLE} |
| 34 | -P ${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake | 34 | -P ${PROJECT_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake |
| 35 | DEPENDS | 35 | DEPENDS |
| 36 | # Check that the scm_rev files haven't changed | 36 | # Check that the scm_rev files haven't changed |
| 37 | "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" | 37 | "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" |
| 38 | "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.h" | 38 | "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.h" |
| 39 | # technically we should regenerate if the git version changed, but its not worth the effort imo | 39 | # technically we should regenerate if the git version changed, but its not worth the effort imo |
| 40 | "${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake" | 40 | "${PROJECT_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake" |
| 41 | VERBATIM | 41 | VERBATIM |
| 42 | ) | 42 | ) |
| 43 | 43 | ||
diff --git a/src/common/settings.h b/src/common/settings.h index 13651de57..851812f28 100644 --- a/src/common/settings.h +++ b/src/common/settings.h | |||
| @@ -530,6 +530,7 @@ struct Values { | |||
| 530 | Setting<bool> use_debug_asserts{false, "use_debug_asserts"}; | 530 | Setting<bool> use_debug_asserts{false, "use_debug_asserts"}; |
| 531 | Setting<bool> use_auto_stub{false, "use_auto_stub"}; | 531 | Setting<bool> use_auto_stub{false, "use_auto_stub"}; |
| 532 | Setting<bool> enable_all_controllers{false, "enable_all_controllers"}; | 532 | Setting<bool> enable_all_controllers{false, "enable_all_controllers"}; |
| 533 | Setting<bool> create_crash_dumps{false, "create_crash_dumps"}; | ||
| 533 | 534 | ||
| 534 | // Miscellaneous | 535 | // Miscellaneous |
| 535 | Setting<std::string> log_filter{"*:Info", "log_filter"}; | 536 | Setting<std::string> log_filter{"*:Info", "log_filter"}; |