diff options
| author | Andrew <forkk@forkk.net> | 2013-11-04 19:58:56 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-11-04 19:58:56 -0600 |
| commit | 5083a6a8090fa03d3c1800c1f9588079ca11e9f9 (patch) | |
| tree | 7c2e88c7184a7f5acf5e7a03be5c5f0bf6904113 /depends/util/CMakeLists.txt | |
| parent | dc3b0fcb2b74aeede37b08216b203cab284f7fce (diff) | |
| parent | bb7e8985f6d189de0acac6a1c3033cb16378c1fb (diff) | |
| download | PrismLauncher-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.gz PrismLauncher-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.bz2 PrismLauncher-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'depends/util/CMakeLists.txt')
| -rw-r--r-- | depends/util/CMakeLists.txt | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/depends/util/CMakeLists.txt b/depends/util/CMakeLists.txt index 35c4db17..5c87c644 100644 --- a/depends/util/CMakeLists.txt +++ b/depends/util/CMakeLists.txt @@ -22,21 +22,18 @@ find_package(Qt5Core REQUIRED) include_directories(${Qt5Base_INCLUDE_DIRS}) # include_directories(${Qt5Network_INCLUDE_DIRS}) -SET(LIBUTIL_HEADERS +SET(LIBUTIL_SOURCES include/libutil_config.h -include/apputils.h - include/pathutils.h +src/pathutils.cpp + include/osutils.h -include/userutils.h -include/cmdutils.h -) -SET(LIBUTIL_SOURCES -src/pathutils.cpp -src/osutils.cpp +include/userutils.h src/userutils.cpp + +include/cmdutils.h src/cmdutils.cpp ) @@ -50,7 +47,7 @@ add_definitions(-DLIBUTIL_LIBRARY) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -add_library(libUtil STATIC ${LIBUTIL_SOURCES} ${LIBUTIL_HEADERS}) +add_library(libUtil STATIC ${LIBUTIL_SOURCES}) # qt5_use_modules(libUtil Core Network) qt5_use_modules(libUtil Core) target_link_libraries(libUtil) |