open_source / crypter

Commit e94133922296ad3ab4e1b1141ebfe66a3af06aab

Authored by Peter M. Groen
1 parent d41a04cc

New cmake setup

Inline Side-by-side
Showing 3 changed files with 6 additions and 5 deletions
scripts/submodules.list
  View file @e941339
1 1 SUB_MODULES_OPEN="cmake
2   -logutils"
  2 +logger"
3 3  
4 4 SUB_MODULES_CLOSED=""
... ...
src/CMakeLists.txt
  View file @e941339
1 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 3 include(projectheader)
4 4 project_header(crypter)
5 5  
... ... @@ -7,6 +7,7 @@ find_package( Qt5Core REQUIRED )
7 7  
8 8 include_directories( SYSTEM
9 9 ${Qt5Core_INCLUDE_DIRS}
  10 + ${CMAKE_SOURCE_DIR}/submodules/logger/src
10 11 )
11 12  
12 13 include(compiler)
... ... @@ -26,7 +27,7 @@ include(library)
26 27 add_libraries(
27 28 ${Qt5Core_LIBRARIES}
28 29 crypto
29   - logutils
  30 + logger
30 31 )
31 32  
32 33 include(installation)
... ...
tests/CMakeLists.txt
  View file @e941339
1 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 4 include(projectheader)
5 5 project_header(test_logutils)
6 6  
7 7 include_directories( SYSTEM
8   - ${CMAKE_CURRENT_SOURCE_DIR}/../../src
  8 + ${CMAKE_SOURCE_DIR}/src
9 9 )
10 10  
11 11 include(compiler)
... ...