diff --git a/DuneCommonConfig.cmake.in b/DuneCommonConfig.cmake.in index 6d38411a501d585df1d06f2c1391c77157c15163..06e29abf0eda626584fac3bf008ef4d77d5b1b68 100644 --- a/DuneCommonConfig.cmake.in +++ b/DuneCommonConfig.cmake.in @@ -1,6 +1,6 @@ #compute installation prefix relative to this file get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_prefix "${_dir}/../.." ABSOLUTE) +get_filename_component(_prefix "${_dir}/../../.." ABSOLUTE) #import the target include("${_prefix}/lib/cmake/@DUNE_MOD_NAME_CMAKE@Targets.cmake") diff --git a/bin/duneproject b/bin/duneproject index 105def5c0493d381e180975c552f8582ed327f92..5d16fd257930fe55a0d60bb497b3267192f73385 100755 --- a/bin/duneproject +++ b/bin/duneproject @@ -841,7 +841,7 @@ echo "- $PROJECT/$CMAKE_NAME""Config.cmake.in" cat> "$PROJECT/$CMAKE_NAME""Config.cmake.in" <<EOF #compute installation prefix relative to this file get_filename_component(_dir "\${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_prefix "\${_dir}/../.." ABSOLUTE) +get_filename_component(_prefix "\${_dir}/../../.." ABSOLUTE) #import the target #include("\${_prefix}/lib/cmake/@DUNE_MOD_NAME@-targets.cmake") diff --git a/cmake/modules/DuneMacros.cmake b/cmake/modules/DuneMacros.cmake index 6620359401dff45ec3ebfba9af1832c0967d3207..3ce7a4888dc6c28b41cb737cd9ebb0dae6c08163 100644 --- a/cmake/modules/DuneMacros.cmake +++ b/cmake/modules/DuneMacros.cmake @@ -274,7 +274,7 @@ MACRO(finalize_dune_project) #install cmake-config files install(FILES ${PROJECT_BINARY_DIR}/${DUNE_MOD_NAME_CMAKE}Config.cmake ${PROJECT_BINARY_DIR}/${DUNE_MOD_NAME_CMAKE}Version.cmake - DESTINATION lib/cmake) + DESTINATION lib/cmake/${DUNE_MOD_NAME_CMAKE}) #install config.h install(FILES config.h.cmake DESTINATION share/${DUNE_MOD_NAME})