diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-04-21 23:33:00 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-04-21 23:33:00 +0200 |
| commit | 9d724e0fe4bfb7b7940f3f0c9719affd22a18722 (patch) | |
| tree | c73e9566e134d2b78e6f1b8bce3c32159b17675f /depends/settings/CMakeLists.txt | |
| parent | a9dfe6d7ec949954b07facff71ee6023e0ced9ee (diff) | |
| parent | a00fb1e8da505768b491e5f4d6266784fb1a27c9 (diff) | |
| download | MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.gz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.lz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.xz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.zip | |
Merge remote-tracking branch 'origin/feature_cmake_style' into develop
Conflicts:
CMakeLists.txt
Diffstat (limited to 'depends/settings/CMakeLists.txt')
| -rw-r--r-- | depends/settings/CMakeLists.txt | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/depends/settings/CMakeLists.txt b/depends/settings/CMakeLists.txt index 3b71f997..346e15b5 100644 --- a/depends/settings/CMakeLists.txt +++ b/depends/settings/CMakeLists.txt @@ -9,28 +9,28 @@ include_directories(${Qt5Base_INCLUDE_DIRS}) include(UseCXX11) include(Coverage) -SET(LIBSETTINGS_SOURCES -libsettings_config.h +set(LIBSETTINGS_SOURCES + libsettings_config.h -inifile.h -inifile.cpp + inifile.h + inifile.cpp -settingsobject.h -settingsobject.cpp -inisettingsobject.h -inisettingsobject.cpp + settingsobject.h + settingsobject.cpp + inisettingsobject.h + inisettingsobject.cpp -setting.h -setting.cpp -overridesetting.h -overridesetting.cpp + setting.h + setting.cpp + overridesetting.h + overridesetting.cpp ) # Set the include dir path. -SET(LIBSETTINGS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PARENT_SCOPE) +set(LIBSETTINGS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PARENT_SCOPE) # Static link! -ADD_DEFINITIONS(-DLIBSETTINGS_STATIC) +add_definitions(-DLIBSETTINGS_STATIC) add_definitions(-DLIBSETTINGS_LIBRARY) |