Commit e94133922296ad3ab4e1b1141ebfe66a3af06aab
1 parent
d41a04cc
New cmake setup
Showing
3 changed files
with
6 additions
and
5 deletions
scripts/submodules.list
src/CMakeLists.txt
| 1 | cmake_minimum_required(VERSION 3.0) | 1 | cmake_minimum_required(VERSION 3.0) |
| 2 | -LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../external/hsoa_create_version_include/cmake) | 2 | +LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/submodules/cmake) |
| 3 | include(projectheader) | 3 | include(projectheader) |
| 4 | project_header(crypter) | 4 | project_header(crypter) |
| 5 | 5 | ||
| @@ -7,6 +7,7 @@ find_package( Qt5Core REQUIRED ) | @@ -7,6 +7,7 @@ find_package( Qt5Core REQUIRED ) | ||
| 7 | 7 | ||
| 8 | include_directories( SYSTEM | 8 | include_directories( SYSTEM |
| 9 | ${Qt5Core_INCLUDE_DIRS} | 9 | ${Qt5Core_INCLUDE_DIRS} |
| 10 | + ${CMAKE_SOURCE_DIR}/submodules/logger/src | ||
| 10 | ) | 11 | ) |
| 11 | 12 | ||
| 12 | include(compiler) | 13 | include(compiler) |
| @@ -26,7 +27,7 @@ include(library) | @@ -26,7 +27,7 @@ include(library) | ||
| 26 | add_libraries( | 27 | add_libraries( |
| 27 | ${Qt5Core_LIBRARIES} | 28 | ${Qt5Core_LIBRARIES} |
| 28 | crypto | 29 | crypto |
| 29 | - logutils | 30 | + logger |
| 30 | ) | 31 | ) |
| 31 | 32 | ||
| 32 | include(installation) | 33 | include(installation) |
tests/CMakeLists.txt
| 1 | cmake_minimum_required(VERSION 3.0) | 1 | cmake_minimum_required(VERSION 3.0) |
| 2 | -LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) | 2 | +LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/submodules/cmake) |
| 3 | 3 | ||
| 4 | include(projectheader) | 4 | include(projectheader) |
| 5 | project_header(test_logutils) | 5 | project_header(test_logutils) |
| 6 | 6 | ||
| 7 | include_directories( SYSTEM | 7 | include_directories( SYSTEM |
| 8 | - ${CMAKE_CURRENT_SOURCE_DIR}/../../src | 8 | + ${CMAKE_SOURCE_DIR}/src |
| 9 | ) | 9 | ) |
| 10 | 10 | ||
| 11 | include(compiler) | 11 | include(compiler) |