summaryrefslogtreecommitdiffstats
path: root/depends
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-12-14 14:00:23 +0100
committerPetr Mrázek <peterix@gmail.com>2013-12-14 14:00:23 +0100
commit8f856f55732e6427e9b4994343b01f9ac0e0daee (patch)
tree09ca49c42d53ed4510d0aa7231bdb2cdad0be459 /depends
parent4623aa44f58575b6d2ceb0b047945ffeb0081f65 (diff)
parent1167a66ac89d1510fbb522544e9733cc086f35eb (diff)
downloadMultiMC-8f856f55732e6427e9b4994343b01f9ac0e0daee.tar
MultiMC-8f856f55732e6427e9b4994343b01f9ac0e0daee.tar.gz
MultiMC-8f856f55732e6427e9b4994343b01f9ac0e0daee.tar.lz
MultiMC-8f856f55732e6427e9b4994343b01f9ac0e0daee.tar.xz
MultiMC-8f856f55732e6427e9b4994343b01f9ac0e0daee.zip
Merge branch 'testing' of https://github.com/02JanDal/MultiMC5 into develop
Conflicts: MultiMC.cpp
Diffstat (limited to 'depends')
-rw-r--r--depends/settings/CMakeLists.txt8
-rw-r--r--depends/util/CMakeLists.txt8
2 files changed, 16 insertions, 0 deletions
diff --git a/depends/settings/CMakeLists.txt b/depends/settings/CMakeLists.txt
index 3de1d792..154697f6 100644
--- a/depends/settings/CMakeLists.txt
+++ b/depends/settings/CMakeLists.txt
@@ -51,6 +51,14 @@ 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} ${LIBSETTINGS_HEADERS} ${LIBSETTINGS_HEADERS_PRIVATE})
qt5_use_modules(libSettings Core)
target_link_libraries(libSettings)
diff --git a/depends/util/CMakeLists.txt b/depends/util/CMakeLists.txt
index 5c87c644..db7d70e6 100644
--- a/depends/util/CMakeLists.txt
+++ b/depends/util/CMakeLists.txt
@@ -47,6 +47,14 @@ 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 Network)
qt5_use_modules(libUtil Core)