Commit b7390482b09949563a741c2941a2df01ea33f782
1 parent
48de2ae5
modified CMakeLists paths to submodules
Showing
4 changed files
with
14 additions
and
13 deletions
CMakeLists.txt
| 1 | 1 | cmake_minimum_required(VERSION 3.0) |
| 2 | 2 | |
| 3 | 3 | # Check to see where cmake is located. |
| 4 | -if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake ) | |
| 5 | - LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) | |
| 6 | -elseif( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../cmake ) | |
| 7 | - LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) | |
| 4 | +if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/submodules/cmake ) | |
| 5 | + LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/submodules/cmake) | |
| 6 | +elseif( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/cmake ) | |
| 7 | + LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/cmake) | |
| 8 | 8 | else() |
| 9 | 9 | return() |
| 10 | 10 | endif() |
| 11 | 11 | |
| 12 | 12 | # Check to see if there is versioning information available |
| 13 | -if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/osdev_versioning/cmake) | |
| 14 | - LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/osdev_versioning/cmake) | |
| 13 | +if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/submodules/osdev_versioning/cmake) | |
| 14 | + LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/submodules/osdev_versioning/cmake) | |
| 15 | 15 | include(osdevversion) |
| 16 | 16 | endif() |
| 17 | 17 | ... | ... |
scripts/setup_submodules
| ... | ... | @@ -107,10 +107,10 @@ function add_submodules() |
| 107 | 107 | echo -e "< ${SUB_MODULE} >" |
| 108 | 108 | if [[ "${OPEN_REPOS[*]}" =~ "${SUB_MODULE}" ]]; |
| 109 | 109 | then |
| 110 | - git submodule add -f ${GIT_URL_SUBS}/${SUB_MODULE}.git ${SUB_MODULE} | |
| 110 | + git submodule add -f ${GIT_URL_SUBS}/${SUB_MODULE}.git submodules/${SUB_MODULE} | |
| 111 | 111 | git config submodule.${SUB_MODULE}.url ${GIT_URL_SUBS}/${SUB_MODULE}.git |
| 112 | 112 | else |
| 113 | - git submodule add -f ${GIT_URL_SUBS_CLOSED}/${SUB_MODULE}.git ${SUB_MODULE} | |
| 113 | + git submodule add -f ${GIT_URL_SUBS_CLOSED}/${SUB_MODULE}.git submodules/${SUB_MODULE} | |
| 114 | 114 | git config submodule.${SUB_MODULE}.url ${GIT_URL_SUBS_CLOSED}/${SUB_MODULE}.git |
| 115 | 115 | fi |
| 116 | 116 | done | ... | ... |
src/CMakeLists.txt
| 1 | -cmake_minimum_required(VERSION 3.0) | |
| 1 | +cmake_minimum_required(VERSION 3.12) | |
| 2 | + | |
| 2 | 3 | LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../external/hsoa_create_version_include/cmake) |
| 3 | 4 | include(projectheader) |
| 4 | 5 | project_header(jobscheduler) |
| ... | ... | @@ -13,9 +14,9 @@ include_directories( SYSTEM |
| 13 | 14 | include(compiler) |
| 14 | 15 | |
| 15 | 16 | include_directories( |
| 16 | - ${CMAKE_CURRENT_SOURCE_DIR}/../logutils/src/ | |
| 17 | - ${CMAKE_CURRENT_SOURCE_DIR}/../config/src/ | |
| 18 | - ${CMAKE_CURRENT_SOURCE_DIR}/../global/src/ | |
| 17 | + ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/logutils/src/ | |
| 18 | + ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/config/src/ | |
| 19 | + ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/global/src/ | |
| 19 | 20 | ) |
| 20 | 21 | |
| 21 | 22 | set(SRC_LIST | ... | ... |
tests/CMakeLists.txt