diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2014-04-07 17:44:52 +0200 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2014-04-07 17:44:52 +0200 |
| commit | 3cd2b898e5bbf00d22647b2b114502c0a8076495 (patch) | |
| tree | cff8e7bcd5c210c07011ffafaede79dc00b69082 /depends | |
| parent | dd7b6642a3b171734126b6b4a14236cfe6406fcf (diff) | |
| parent | 17d4947b30f00a347d7fb8648040271e4b65f966 (diff) | |
| download | MultiMC-3cd2b898e5bbf00d22647b2b114502c0a8076495.tar MultiMC-3cd2b898e5bbf00d22647b2b114502c0a8076495.tar.gz MultiMC-3cd2b898e5bbf00d22647b2b114502c0a8076495.tar.lz MultiMC-3cd2b898e5bbf00d22647b2b114502c0a8076495.tar.xz MultiMC-3cd2b898e5bbf00d22647b2b114502c0a8076495.zip | |
Merge remote-tracking branch 'origin/develop' into feature_cmake_style
Conflicts:
CMakeLists.txt
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/settings/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | depends/util/CMakeLists.txt | 24 |
2 files changed, 4 insertions, 30 deletions
diff --git a/depends/settings/CMakeLists.txt b/depends/settings/CMakeLists.txt index 868b31e6..aa44b731 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) diff --git a/depends/util/CMakeLists.txt b/depends/util/CMakeLists.txt index 969c4a78..137d232e 100644 --- a/depends/util/CMakeLists.txt +++ b/depends/util/CMakeLists.txt @@ -1,19 +1,7 @@ project(libUtil) -######## Set compiler flags ######## -IF(APPLE) - # assume clang 4.1.0+, add C++0x/C++11 stuff - message(STATUS "Using APPLE CMAKE_CXX_FLAGS") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -ELSEIF(UNIX) - # assume GCC, add C++0x/C++11 stuff - MESSAGE(STATUS "Using UNIX CMAKE_CXX_FLAGS") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -ELSEIF(MINGW) - MESSAGE(STATUS "Using MINGW CMAKE_CXX_FLAGS") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x") -ENDIF() - +include(UseCXX11) +include(Coverage) # Find Qt find_package(Qt5Core REQUIRED) @@ -49,14 +37,6 @@ add_definitions(-DLIBUTIL_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(libUtil STATIC ${LIBUTIL_SOURCES}) qt5_use_modules(libUtil Core) target_link_libraries(libUtil) |