diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-04-06 20:56:40 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-04-06 20:56:40 +0200 |
| commit | 17d4947b30f00a347d7fb8648040271e4b65f966 (patch) | |
| tree | 2a67eb53d6a72a39119adec905db5b899f691e3e /depends/settings | |
| parent | 6ef38d0873bc424ff72d0eb5363924b00b0cadc2 (diff) | |
| parent | eb246c4fa744bd50e008455f5f8363114b4de3eb (diff) | |
| download | PrismLauncher-17d4947b30f00a347d7fb8648040271e4b65f966.tar.gz PrismLauncher-17d4947b30f00a347d7fb8648040271e4b65f966.tar.bz2 PrismLauncher-17d4947b30f00a347d7fb8648040271e4b65f966.zip | |
Merge remote-tracking branch 'origin/feature_dotcmake' into develop
Diffstat (limited to 'depends/settings')
| -rw-r--r-- | depends/settings/CMakeLists.txt | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/depends/settings/CMakeLists.txt b/depends/settings/CMakeLists.txt index da853a73..3b71f997 100644 --- a/depends/settings/CMakeLists.txt +++ b/depends/settings/CMakeLists.txt @@ -6,6 +6,8 @@ find_package(Qt5Core REQUIRED) # Include Qt headers. include_directories(${Qt5Base_INCLUDE_DIRS}) +include(UseCXX11) +include(Coverage) SET(LIBSETTINGS_SOURCES libsettings_config.h @@ -34,14 +36,6 @@ add_definitions(-DLIBSETTINGS_LIBRARY) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -IF(MultiMC_CODE_COVERAGE) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 --coverage") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 --coverage") - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0 --coverage") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g -O0 --coverage") - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -O0 --coverage") -ENDIF(MultiMC_CODE_COVERAGE) - add_library(libSettings STATIC ${LIBSETTINGS_SOURCES}) qt5_use_modules(libSettings Core) target_link_libraries(libSettings) |