summaryrefslogtreecommitdiffstats
path: root/depends/settings/CMakeLists.txt
diff options
context:
space:
mode:
authorForkk <forkk@forkk.net>2014-01-02 13:38:20 -0600
committerForkk <forkk@forkk.net>2014-01-02 13:38:20 -0600
commit17f1864a71b69b9df14d8e06ed48a65e678d09c9 (patch)
tree4d98a2b3493a26017150d6ba8c5ae0419de3de7d /depends/settings/CMakeLists.txt
parent4495e20cd7f7f2ab062f3b60f19ac4b79f32c350 (diff)
parentaa5f2c8120cc23de0d57c9f0280512adb9a531b3 (diff)
downloadMultiMC-17f1864a71b69b9df14d8e06ed48a65e678d09c9.tar
MultiMC-17f1864a71b69b9df14d8e06ed48a65e678d09c9.tar.gz
MultiMC-17f1864a71b69b9df14d8e06ed48a65e678d09c9.tar.lz
MultiMC-17f1864a71b69b9df14d8e06ed48a65e678d09c9.tar.xz
MultiMC-17f1864a71b69b9df14d8e06ed48a65e678d09c9.zip
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
Conflicts: CMakeLists.txt gui/MainWindow.h
Diffstat (limited to 'depends/settings/CMakeLists.txt')
-rw-r--r--depends/settings/CMakeLists.txt43
1 files changed, 13 insertions, 30 deletions
diff --git a/depends/settings/CMakeLists.txt b/depends/settings/CMakeLists.txt
index 154697f6..da853a73 100644
--- a/depends/settings/CMakeLists.txt
+++ b/depends/settings/CMakeLists.txt
@@ -5,44 +5,27 @@ find_package(Qt5Core REQUIRED)
# Include Qt headers.
include_directories(${Qt5Base_INCLUDE_DIRS})
-include_directories(${Qt5Network_INCLUDE_DIRS})
-SET(LIBSETTINGS_HEADERS
-include/libsettings_config.h
-
-include/inifile.h
-
-include/settingsobject.h
-include/setting.h
-include/overridesetting.h
-
-include/basicsettingsobject.h
-include/inisettingsobject.h
-
-include/keyring.h
-)
-
-SET(LIBSETTINGS_HEADERS_PRIVATE
-src/stubkeyring.h
-)
SET(LIBSETTINGS_SOURCES
-src/inifile.cpp
+libsettings_config.h
-src/settingsobject.cpp
-src/setting.cpp
-src/overridesetting.cpp
+inifile.h
+inifile.cpp
-src/basicsettingsobject.cpp
-src/inisettingsobject.cpp
+settingsobject.h
+settingsobject.cpp
+inisettingsobject.h
+inisettingsobject.cpp
-src/keyring.cpp
-src/stubkeyring.cpp
+setting.h
+setting.cpp
+overridesetting.h
+overridesetting.cpp
)
# Set the include dir path.
-SET(LIBSETTINGS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
-include_directories(${LIBSETTINGS_INCLUDE_DIR})
+SET(LIBSETTINGS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PARENT_SCOPE)
# Static link!
ADD_DEFINITIONS(-DLIBSETTINGS_STATIC)
@@ -59,6 +42,6 @@ IF(MultiMC_CODE_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})
+add_library(libSettings STATIC ${LIBSETTINGS_SOURCES})
qt5_use_modules(libSettings Core)
target_link_libraries(libSettings)