Commit 9aa7c53b authored by Max Lyon's avatar Max Lyon
Browse files

move build interface and install interface defifintions of include directories to same place

parent 67a4452e
Pipeline #16279 passed with stages
in 4 minutes and 57 seconds
......@@ -75,10 +75,12 @@ target_include_directories(CoMISo
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..> # TODO: this is dangerous!
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/CoMISo>
)
if ( QT5_FOUND )
target_link_libraries (CoMISo PUBLIC ${QT_LIBRARIES})
target_link_libraries(CoMISo PUBLIC ${QT_LIBRARIES})
endif()
vci_get_version ()
......@@ -643,12 +645,6 @@ if(NOT COMISO_NO_INSTALL)
include(CMakePackageConfigHelpers)
include(GNUInstallDirs)
target_include_directories(CoMISo
PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/CoMISo>
)
set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/CoMISo)
write_basic_package_version_file(
......@@ -696,5 +692,3 @@ if(NOT COMISO_NO_INSTALL)
FILE CoMISoConfig.cmake)
export(PACKAGE CoMISo)
endif()
list(REMOVE_AT CMAKE_MODULE_PATH -1)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment