Skip to content
Snippets Groups Projects

Resolve "Cmake correct includes"

Merged Mederic Fourmy requested to merge 462-cmake-correct-includes into devel
1 file
+ 5
10
Compare changes
  • Side-by-side
  • Inline
+ 5
10
@@ -101,14 +101,9 @@ IF(EXISTS "${WOLF_CONFIG_DIR}" AND NOT IS_DIRECTORY "${WOLF_CONFIG_DIR}")
message(FATAL_ERROR "Bug: Specified CONFIG_DIR: "
"${WOLF_CONFIG_DIR} exists, but is not a directory.")
ENDIF()
# Configure config.h
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/internal/config.h.in "${WOLF_CONFIG_DIR}/config.h")
message(STATUS "WOLF CONFIG DIRECTORY ${WOLF_CONFIG_DIR}")
message(STATUS "WOLF CONFIG FILE ${WOLF_CONFIG_DIR}/config.h")
include_directories("${PROJECT_BINARY_DIR}/conf")
# ============ INCLUDES ============
INCLUDE_DIRECTORIES("include") # In this same project
# ============ HEADERS ============
SET(HDRS_CAPTURE
@@ -450,9 +445,9 @@ install(
${LIB_INSTALL_DIR}/${PLUGIN_NAME}/cmake
)
# Specifies include directories to use when compiling the plugin target
# This way, include_directories does not need to be called in plugins depending on this one
target_include_directories(${PLUGIN_NAME} INTERFACE
target_include_directories(${PLUGIN_NAME} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/conf>
$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
)
@@ -498,7 +493,7 @@ INSTALL(FILES ${HDRS_UTILS}
INSTALL(FILES ${HDRS_YAML}
DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/yaml)
INSTALL(FILES "${WOLF_CONFIG_DIR}/config.h"
INSTALL(FILES ${WOLF_CONFIG_DIR}/config.h
DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/internal)
export(PACKAGE ${PLUGIN_NAME})
Loading