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/util | |
| parent | a9dfe6d7ec949954b07facff71ee6023e0ced9ee (diff) | |
| parent | a00fb1e8da505768b491e5f4d6266784fb1a27c9 (diff) | |
| download | PrismLauncher-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.gz PrismLauncher-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.bz2 PrismLauncher-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.zip | |
Merge remote-tracking branch 'origin/feature_cmake_style' into develop
Conflicts:
CMakeLists.txt
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 eb50277b..7a18067c 100644 --- a/depends/util/CMakeLists.txt +++ b/depends/util/CMakeLists.txt @@ -8,37 +8,35 @@ 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) set(CMAKE_POSITION_INDEPENDENT_CODE ON) add_library(libUtil STATIC ${LIBUTIL_SOURCES}) -# qt5_use_modules(libUtil Core Network) qt5_use_modules(libUtil Core) target_link_libraries(libUtil) |