Skip to content

Commit 69d013d

Browse files
ax3ltheZiz
authored andcommitted
Fix Installed Config DIR
Replace the base directory of ISAAC with the prefix on install. Before, the location of the (nested) CMake config package was taken, which resulted in broken include paths (`<isaac.hpp>` can not be found).
1 parent 620847c commit 69d013d

File tree

4 files changed

+28
-7
lines changed

4 files changed

+28
-7
lines changed

lib/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,15 @@ configure_file (
66
"${PROJECT_BINARY_DIR}/ISAACConfigVersion.cmake"
77
@ONLY
88
)
9+
configure_file (
10+
"${PROJECT_SOURCE_DIR}/ISAACBaseDir.cmake.in"
11+
"${PROJECT_BINARY_DIR}/ISAACBaseDir.cmake"
12+
@ONLY
13+
)
914

1015
install( FILES "${CMAKE_CURRENT_SOURCE_DIR}/isaac.hpp" DESTINATION "include" )
1116
install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/isaac" DESTINATION "include" PATTERN "mainpage.dox" EXCLUDE )
1217
install( FILES "${CMAKE_CURRENT_SOURCE_DIR}/ISAACConfig.cmake" DESTINATION "lib/cmake/ISAAC" )
1318
install( FILES "${PROJECT_BINARY_DIR}/ISAACConfigVersion.cmake" DESTINATION "lib/cmake/ISAAC" )
19+
install( FILES "${PROJECT_BINARY_DIR}/ISAACBaseDir.cmake" DESTINATION "lib/cmake/ISAAC" )
20+
install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../Modules" DESTINATION "lib/cmake/ISAAC")

lib/ISAACBaseDir.cmake

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
###############################################################################
2+
# INCLUDES
3+
###############################################################################
4+
set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} "${ISAAC_DIR}")
5+
set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} "${ISAAC_DIR}/isaac")
6+
7+
###############################################################################
8+
# MODULES
9+
###############################################################################
10+
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${ISAAC_DIR}/../Modules")

lib/ISAACBaseDir.cmake.in

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
###############################################################################
2+
# INCLUDES
3+
###############################################################################
4+
set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} "@CMAKE_INSTALL_PREFIX@/include")
5+
set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} "@CMAKE_INSTALL_PREFIX@/include/isaac")
6+
7+
###############################################################################
8+
# MODULES
9+
###############################################################################
10+
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/Modules")

lib/ISAACConfig.cmake

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,7 @@
1919
cmake_minimum_required (VERSION 3.3.0)
2020
cmake_policy(SET CMP0048 OLD)
2121

22-
set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} "${ISAAC_DIR}")
23-
set(ISAAC_INCLUDE_DIRS ${ISAAC_INCLUDE_DIRS} "${ISAAC_DIR}/isaac")
24-
25-
###############################################################################
26-
# MODULES
27-
###############################################################################
28-
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${ISAAC_DIR}/Modules")
22+
include("${CMAKE_CURRENT_LIST_DIR}/ISAACBaseDir.cmake")
2923

3024
###############################################################################
3125
# OPTIONS

0 commit comments

Comments
 (0)