Commit d41a04cca119cc8140f8798f5ac91410c2a0e861
1 parent
369f26d1
Adapted to the new versioning system
Showing
2 changed files
with
4 additions
and
26 deletions
CMakeLists.txt
| 1 | cmake_minimum_required(VERSION 3.0) | 1 | cmake_minimum_required(VERSION 3.0) |
| 2 | +LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/submodules/cmake) | ||
| 2 | project(osdev_crypter) | 3 | 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) | ||
| 11 | -else() | ||
| 12 | - message( FATAL_ERROR "No cmake directory found. Did you run the submodules script?" ) | ||
| 13 | -endif() | ||
| 14 | 4 | ||
| 15 | -# ============================================================================== | ||
| 16 | -# Check to see if there is versioning information available | ||
| 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?" ) | ||
| 23 | -endif() | ||
| 24 | - | ||
| 25 | -# ============================================================================== | ||
| 26 | include(projectheader) | 5 | include(projectheader) |
| 27 | project_header(osdev_crypter) | 6 | project_header(osdev_crypter) |
| 28 | 7 | ||
| 29 | add_subdirectory(src) | 8 | add_subdirectory(src) |
| 30 | add_subdirectory(tests) | 9 | add_subdirectory(tests) |
| 31 | 10 | ||
| 32 | -# include(packaging) | ||
| 33 | -# package_component() | 11 | +include(packaging) |
| 12 | +package_component() |