From f676d89b9400f429c7d8557888c44f48b0e29780 Mon Sep 17 00:00:00 2001 From: Steven de Ridder Date: Wed, 26 Jan 2022 09:16:27 +0100 Subject: [PATCH] Updated CMakeLists.txt --- CMakeLists.txt | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c9b4a94..3fd403f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,25 +1,34 @@ cmake_minimum_required(VERSION 3.0) - -# Check to see where cmake is located. -if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake ) +project(osdev_dbconnector) +# ============================================================================== +# Check to see if we're a submodule or top-repo. +if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + message( STATUS "Looks like we're a single module" ) LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -elseif( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../cmake ) +elseif(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) + message( STATUS "Looks like we're a submodule" ) LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) else() - return() + message( FATAL_ERROR "No cmake directory found. Did you run the submodules script?" ) endif() +# ============================================================================== # Check to see if there is versioning information available -if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/osdev_versioning/cmake) - LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/osdev_versioning/cmake) - include(osdevversion) +if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/versioning) + LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/versioning/cmake) +elseif(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../versioning) + LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../versioning/cmake) +else() + message( FATAL_ERROR "No ${CURRENT_SOURCE_DIR}/osdev_versioning directory found. Did you run the submodules script?" ) endif() +# ============================================================================== + include(projectheader) project_header(osdev_dbconnector) add_subdirectory(src) add_subdirectory(tests) -# include(packaging) -# package_component() +include(packaging) +package_component() -- libgit2 0.21.4