open_source / logger

Commit 2db083bb09abf2c5486d8d2b7a55c2cfeb1a4235

Authored by Peter M. Groen
2 parents 16b5ccd8 246f6f6c

Merge branch 'feat/pgroen/compile_as_static_lib' into 'master' 

Feat/pgroen/compile as static lib

See merge request !1
Inline Side-by-side
Showing 5 changed files with 7 additions and 5 deletions
CMakeLists.txt
  View file @2db083b
... ... @@ -2,11 +2,12 @@ cmake_minimum_required(VERSION 3.0)
2 2 project(osdev_logger)
3 3  
4 4 LIST( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/submodules/cmake )
5   -LIST( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/submodules/versioning/cmake )
6 5  
7 6 include(projectheader)
8 7 project_header(osdev_logger)
9 8  
  9 +set(BUILD_STATIC "ON")
  10 +
10 11 add_subdirectory(src)
11 12 add_subdirectory(tests)
12 13  
... ...
scripts/submodules.list
  View file @2db083b
1   -SUB_MODULES_OPEN="versioning
2   -cmake"
  1 +SUB_MODULES_OPEN="cmake"
3 2  
4 3 SUB_MODULES_CLOSED=""
... ...
src/CMakeLists.txt
  View file @2db083b
... ... @@ -2,13 +2,14 @@ cmake_minimum_required(VERSION 3.12)
2 2 include(projectheader)
3 3 project_header(logger)
4 4  
  5 +set(BUILD_AS_STATIC "ON")
  6 +
5 7 include_directories( SYSTEM
6 8 )
7 9  
8 10 include(compiler)
9 11  
10 12 set(SRC_LIST
11   - #${CMAKE_CURRENT_SOURCE_DIR}/logger.cpp
12 13 ${CMAKE_CURRENT_SOURCE_DIR}/threadcontext.cpp
13 14 ${CMAKE_CURRENT_SOURCE_DIR}/log.cpp
14 15 )
... ...
  1 +Subproject commit 83d7bf32bbdfb50a077daaa1d4cc9d611570b93e
... ...
tests/CMakeLists.txt
  View file @2db083b
1 1 cmake_minimum_required(VERSION 3.12)
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_logger)
... ...