open_source / logutils

Commit 3a023548dcb4c366e9376ea1bcca954eb6b15aff

Authored by Steven de Ridder
1 parent ae88a87f

adjusted cmakelists to find submodule folder.

Inline Side-by-side
Showing 2 changed files with 20 additions and 11 deletions
CMakeLists.txt
  View file @3a02354
1 cmake_minimum_required(VERSION 3.0) 1 cmake_minimum_required(VERSION 3.0)
2 2
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) 3 +project(osdev_logutils)
  4 +# ==============================================================================
  5 +# Check to see if we're a submodule or top-repo.
  6 +if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/submodules/cmake)
  7 + message( STATUS "Looks like we're a single module" )
  8 + LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/submodules/cmake)
  9 +elseif(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/cmake)
  10 + message( STATUS "Looks like we're a submodule" )
  11 + LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/cmake)
8 else() 12 else()
9 - return() 13 + message( FATAL_ERROR "No cmake directory found. Did you run the submodules script?" )
10 endif() 14 endif()
11 15
  16 +# ==============================================================================
12 # Check to see if there is versioning information available 17 # 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)  
15 - include(osdevversion) 18 +if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/submodules/versioning)
  19 + LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/submodules/versioning/cmake)
  20 +elseif(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/versioning)
  21 + LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/versioning/cmake)
  22 +else()
  23 + message( FATAL_ERROR "No ${CURRENT_SOURCE_DIR}/osdev_versioning directory found. Did you run the submodules script?" )
16 endif() 24 endif()
17 25
  26 +# ==============================================================================
18 include(projectheader) 27 include(projectheader)
19 project_header(osdev_logutils) 28 project_header(osdev_logutils)
20 29
scripts/setup_submodules
  View file @3a02354
@@ -107,10 +107,10 @@ function add_submodules() @@ -107,10 +107,10 @@ function add_submodules()
107 echo -e "< ${SUB_MODULE} >" 107 echo -e "< ${SUB_MODULE} >"
108 if [[ "${OPEN_REPOS[*]}" =~ "${SUB_MODULE}" ]]; 108 if [[ "${OPEN_REPOS[*]}" =~ "${SUB_MODULE}" ]];
109 then 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 git config submodule.${SUB_MODULE}.url ${GIT_URL_SUBS}/${SUB_MODULE}.git 111 git config submodule.${SUB_MODULE}.url ${GIT_URL_SUBS}/${SUB_MODULE}.git
112 else 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 git config submodule.${SUB_MODULE}.url ${GIT_URL_SUBS_CLOSED}/${SUB_MODULE}.git 114 git config submodule.${SUB_MODULE}.url ${GIT_URL_SUBS_CLOSED}/${SUB_MODULE}.git
115 fi 115 fi
116 done 116 done