diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2015-10-12 12:54:19 +0100 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2015-10-12 12:54:19 +0100 |
| commit | 077a58f410b4d4ef32f7a9ebc0821f08c3cec6eb (patch) | |
| tree | ba17c41455a06a74224a096544efd3c3355b3e21 /CMakeLists.txt | |
| parent | f5c86bc22c23374540d07ef63320b810c39e1df4 (diff) | |
| parent | 7d93a9a2003f31188e4da8cbcd7e5df0352bb900 (diff) | |
Merge branch 'master' of https://github.com/TanninOne/modorganizer into archive_cleanup
# Conflicts:
# src/installationmanager.cpp
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cfd8f902..e255f2b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) -SET(DEPENDENCIES_DIR CACHE PATH "") +PROJECT(organizer) +SET(DEPENDENCIES_DIR CACHE PATH "") # hint to find qt in dependencies path -SET(CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR}/qt5/lib/cmake) +LIST(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR}/qt5/lib/cmake) FILE(GLOB_RECURSE BOOST_ROOT ${DEPENDENCIES_DIR}/boost*/project-config.jam) GET_FILENAME_COMPONENT(BOOST_ROOT ${BOOST_ROOT} DIRECTORY) -FILE(GLOB_RECURSE ZLIB_ROOT ${DEPENDENCIES_DIR}/zlib*/zlib.h) -GET_FILENAME_COMPONENT(ZLIB_ROOT ${ZLIB_ROOT} DIRECTORY) +SET(ZLIB_ROOT ${DEPENDENCIES_DIR}/zlib) ADD_SUBDIRECTORY(src)
\ No newline at end of file |