diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2014-04-06 19:43:09 +0200 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2014-04-06 19:43:09 +0200 |
| commit | dd7b6642a3b171734126b6b4a14236cfe6406fcf (patch) | |
| tree | 6afd61aa059371fffc52bd6f3eb6f6b240e5a4e2 /depends/util | |
| parent | 482ad250a4454d993a98488edfe01d7f9dc35de7 (diff) | |
| download | MultiMC-dd7b6642a3b171734126b6b4a14236cfe6406fcf.tar MultiMC-dd7b6642a3b171734126b6b4a14236cfe6406fcf.tar.gz MultiMC-dd7b6642a3b171734126b6b4a14236cfe6406fcf.tar.lz MultiMC-dd7b6642a3b171734126b6b4a14236cfe6406fcf.tar.xz MultiMC-dd7b6642a3b171734126b6b4a14236cfe6406fcf.zip | |
Use the same style of CMake files everywhere
Diffstat (limited to 'depends/util')
| -rw-r--r-- | depends/util/CMakeLists.txt | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/depends/util/CMakeLists.txt b/depends/util/CMakeLists.txt index 7f6573bd..969c4a78 100644 --- a/depends/util/CMakeLists.txt +++ b/depends/util/CMakeLists.txt @@ -20,31 +20,30 @@ find_package(Qt5Core REQUIRED) # Include Qt headers. include_directories(${Qt5Base_INCLUDE_DIRS}) -# include_directories(${Qt5Network_INCLUDE_DIRS}) -SET(LIBUTIL_SOURCES -include/libutil_config.h +set(LIBUTIL_SOURCES + include/libutil_config.h -include/pathutils.h -src/pathutils.cpp + include/pathutils.h + src/pathutils.cpp -include/osutils.h + include/osutils.h -include/userutils.h -src/userutils.cpp + include/userutils.h + src/userutils.cpp -include/cmdutils.h -src/cmdutils.cpp + include/cmdutils.h + src/cmdutils.cpp -include/modutils.h -src/modutils.cpp + include/modutils.h + src/modutils.cpp ) # Set the include dir path. -SET(LIBUTIL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE) +set(LIBUTIL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE) # Static link! -ADD_DEFINITIONS(-DLIBUTIL_STATIC) +add_definitions(-DLIBUTIL_STATIC) add_definitions(-DLIBUTIL_LIBRARY) @@ -59,6 +58,5 @@ IF(MultiMC_CODE_COVERAGE) ENDIF(MultiMC_CODE_COVERAGE) add_library(libUtil STATIC ${LIBUTIL_SOURCES}) -# qt5_use_modules(libUtil Core Network) qt5_use_modules(libUtil Core) target_link_libraries(libUtil) |