open_source / crypter

Commit 853562530072e7e32b78c2742142db9ec2e82c4c

Authored by Steven de Ridder
1 parent 36d52819

adjusted cmakelists to find the subdirectory folder.

Inline Side-by-side
Showing 2 changed files with 20 additions and 12 deletions
CMakeLists.txt
  View file @8535625
1 cmake_minimum_required(VERSION 3.0) 1 cmake_minimum_required(VERSION 3.0)
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) 2 +project(osdev_crypter)
  3 +# ==============================================================================
  4 +# Check to see if we're a submodule or top-repo.
  5 +if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/submodules/cmake)
  6 + message( STATUS "Looks like we're a single module" )
  7 + LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/submodules/cmake)
  8 +elseif(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/cmake)
  9 + message( STATUS "Looks like we're a submodule" )
  10 + LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/cmake)
8 else() 11 else()
9 - return() 12 + message( FATAL_ERROR "No cmake directory found. Did you run the submodules script?" )
10 endif() 13 endif()
11 14
  15 +# ==============================================================================
12 # Check to see if there is versioning information available 16 # 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) 17 +if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/submodules/versioning)
  18 + LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/submodules/versioning/cmake)
  19 +elseif(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/versioning)
  20 + LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/versioning/cmake)
  21 +else()
  22 + message( FATAL_ERROR "No ${CURRENT_SOURCE_DIR}/osdev_versioning directory found. Did you run the submodules script?" )
16 endif() 23 endif()
17 24
  25 +# ==============================================================================
18 include(projectheader) 26 include(projectheader)
19 project_header(osdev_crypter) 27 project_header(osdev_crypter)
20 28
scripts/setup_submodules
  View file @8535625
@@ -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