diff --git a/CMakeLists.txt b/CMakeLists.txt index 64d5bb384..1f08d4bab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -274,7 +274,7 @@ set(eCAL_install_app_dir ${CMAKE_INSTALL_BINDIR}) set(eCAL_install_archive_dir ${CMAKE_INSTALL_LIBDIR}) set(eCAL_install_archive_dyn_dir ${CMAKE_INSTALL_LIBDIR}) set(eCAL_install_bin_dir ${CMAKE_INSTALL_BINDIR}) -set(eCAL_install_cmake_dir ${CMAKE_INSTALL_LIBDIR}/cmake/eCAL) +set(eCAL_install_cmake_dir share/eCAL) set(eCAL_install_config_dir ${CMAKE_INSTALL_SYSCONFDIR}/ecal) set(eCAL_install_doc_dir ${CMAKE_INSTALL_DOCDIR}) set(eCAL_install_include_dir ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/thirdparty/cmake_functions/CMakeLists.txt b/thirdparty/cmake_functions/CMakeLists.txt index 3ba185a97..aa9e8a736 100644 --- a/thirdparty/cmake_functions/CMakeLists.txt +++ b/thirdparty/cmake_functions/CMakeLists.txt @@ -4,12 +4,8 @@ include(cmake_functions.cmake) project(CMakeFunctions VERSION 0.4.1) -if (MSVC) -# Variable definitions -set(cmake_functions_install_cmake_dir cmake) -else (MSVC) -set(cmake_functions_install_cmake_dir lib/cmake/${PROJECT_NAME}-${PROJECT_VERSION}) -endif (MSVC) +set(cmake_functions_install_cmake_dir "share/${PROJECT_NAME}") + set(cmake_functions_config ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake) set(cmake_functions_config_version ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake)