Merged
Merge Request #1
·
created by 
Feat/pgroen/compile as static lib
From
feat/pgroen/compile_as_static_lib
into
master
1 participants
-
Status changed to merged
-
mentioned in commit 2db083bb09abf2c5486d8d2b7a55c2cfeb1a4235
-
…logger into feat/pgroen/compile_as_static_lib
Showing
5 changed files
CMakeLists.txt
| @@ -2,11 +2,12 @@ cmake_minimum_required(VERSION 3.0) | @@ -2,11 +2,12 @@ cmake_minimum_required(VERSION 3.0) | ||
| 2 | project(osdev_logger) | 2 | project(osdev_logger) |
| 3 | 3 | ||
| 4 | LIST( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/submodules/cmake ) | 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 | include(projectheader) | 6 | include(projectheader) |
| 8 | project_header(osdev_logger) | 7 | project_header(osdev_logger) |
| 9 | 8 | ||
| 9 | +set(BUILD_STATIC "ON") | ||
| 10 | + | ||
| 10 | add_subdirectory(src) | 11 | add_subdirectory(src) |
| 11 | add_subdirectory(tests) | 12 | add_subdirectory(tests) |
| 12 | 13 |
scripts/submodules.list
src/CMakeLists.txt
| @@ -2,13 +2,14 @@ cmake_minimum_required(VERSION 3.12) | @@ -2,13 +2,14 @@ cmake_minimum_required(VERSION 3.12) | ||
| 2 | include(projectheader) | 2 | include(projectheader) |
| 3 | project_header(logger) | 3 | project_header(logger) |
| 4 | 4 | ||
| 5 | +set(BUILD_AS_STATIC "ON") | ||
| 6 | + | ||
| 5 | include_directories( SYSTEM | 7 | include_directories( SYSTEM |
| 6 | ) | 8 | ) |
| 7 | 9 | ||
| 8 | include(compiler) | 10 | include(compiler) |
| 9 | 11 | ||
| 10 | set(SRC_LIST | 12 | set(SRC_LIST |
| 11 | - #${CMAKE_CURRENT_SOURCE_DIR}/logger.cpp | ||
| 12 | ${CMAKE_CURRENT_SOURCE_DIR}/threadcontext.cpp | 13 | ${CMAKE_CURRENT_SOURCE_DIR}/threadcontext.cpp |
| 13 | ${CMAKE_CURRENT_SOURCE_DIR}/log.cpp | 14 | ${CMAKE_CURRENT_SOURCE_DIR}/log.cpp |
| 14 | ) | 15 | ) |
| 1 | +Subproject commit 83d7bf32bbdfb50a077daaa1d4cc9d611570b93e |
tests/CMakeLists.txt
| 1 | cmake_minimum_required(VERSION 3.12) | 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 | include(projectheader) | 4 | include(projectheader) |
| 5 | project_header(test_logger) | 5 | project_header(test_logger) |