open_source / dbconnector

Commit 02fc65bfbe98bef02ab466dd5f5a7d3b444abcaa

Authored by Steven de Ridder
1 parent 80c07441

adjusted cmakelists to find the subdirectory folder.

Inline Side-by-side
Showing 1 changed file with 4 additions and 26 deletions
src/CMakeLists.txt
  View file @02fc65b
1 1 cmake_minimum_required(VERSION 3.12)
2   -# ==============================================================================
3   -# Check to see if we're a submodule or top-repo.
4   -if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/cmake)
5   - message( STATUS "Looks like we're a single module" )
6   - LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/cmake)
7   -elseif(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../submodules/cmake)
8   - message( STATUS "Looks like we're a submodule" )
9   - LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../submodules/cmake)
10   -else()
11   - message( FATAL_ERROR "No cmake directory found. Did you run the submodules script?" )
12   -endif()
13   -
14   -# ==============================================================================
15   -# Check to see if there is versioning information available
16   -if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/versioning)
17   - LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/versioning/cmake)
18   -elseif(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../submodules/versioning)
19   - LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../submodules/versioning/cmake)
20   -else()
21   - message( FATAL_ERROR "No ${CURRENT_SOURCE_DIR}/osdev_versioning directory found. Did you run the submodules script?" )
22   -endif()
23   -# ==============================================================================
24 2  
25 3 include(projectheader)
26 4 project_header(dbconnector)
... ... @@ -36,10 +14,10 @@ include_directories( SYSTEM
36 14 include(compiler)
37 15  
38 16 include_directories(
39   - ${CMAKE_CURRENT_SOURCE_DIR}/../pugixml/src/
40   - ${CMAKE_CURRENT_SOURCE_DIR}/../logutils/src/
41   - ${CMAKE_CURRENT_SOURCE_DIR}/../config/src/
42   - ${CMAKE_CURRENT_SOURCE_DIR}/../global/src/
  17 + ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/pugixml/src/
  18 + ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/logutils/src/
  19 + ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/config/src/
  20 + ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/global/src/
43 21 )
44 22  
45 23 set(SRC_LIST
... ...