From 49be67bb797d111298414dbe202dfdfc2ca410f5 Mon Sep 17 00:00:00 2001 From: Pere Mato <pere.mato@cern.ch> Date: Mon, 19 Aug 2019 17:22:49 +0200 Subject: [PATCH] Revert "Undo changes in GaudiProjectConfig.cmake since is breaking LHCb" This reverts commit e16edf7d31c58a7f971cfb91dfa08301bd7cae9c. --- cmake/GaudiProjectConfig.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/GaudiProjectConfig.cmake b/cmake/GaudiProjectConfig.cmake index fec995ed1b..6008138916 100644 --- a/cmake/GaudiProjectConfig.cmake +++ b/cmake/GaudiProjectConfig.cmake @@ -824,7 +824,7 @@ if os.path.exists('${CMAKE_SOURCE_DIR}/${package}/python/${pypack}/__init__.py') # - produce environment XML description # release version gaudi_generate_env_conf(${env_release_xml} ${project_environment}) - install(FILES ${env_release_xml} DESTINATION .) + install(FILES ${env_release_xml} DESTINATION cmake) # build-time version gaudi_generate_env_conf(${env_xml} ${project_build_environment}) # add a small wrapper script in the build directory to easily run anything @@ -2922,7 +2922,7 @@ if(PACKAGE_NAME STREQUAL PACKAGE_FIND_NAME) endif() endif() ") - install(FILES ${CMAKE_CONFIG_OUTPUT_DIRECTORY}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake DESTINATION .) + install(FILES ${CMAKE_CONFIG_OUTPUT_DIRECTORY}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake DESTINATION cmake) endmacro() #------------------------------------------------------------------------------- @@ -2947,10 +2947,10 @@ set(${CMAKE_PROJECT_NAME}_VERSION_PATCH ${CMAKE_PROJECT_VERSION_PATCH}) set(${CMAKE_PROJECT_NAME}_USES ${PROJECT_USE}) set(${CMAKE_PROJECT_NAME}_DATA ${PROJECT_DATA}) -list(INSERT CMAKE_MODULE_PATH 0 \${${CMAKE_PROJECT_NAME}_DIR}/cmake) +list(INSERT CMAKE_MODULE_PATH 0 \${${CMAKE_PROJECT_NAME}_DIR}) include(${CMAKE_PROJECT_NAME}PlatformConfig) ") - install(FILES ${CMAKE_CONFIG_OUTPUT_DIRECTORY}/${CMAKE_PROJECT_NAME}Config.cmake DESTINATION .) + install(FILES ${CMAKE_CONFIG_OUTPUT_DIRECTORY}/${CMAKE_PROJECT_NAME}Config.cmake DESTINATION cmake) endmacro() #------------------------------------------------------------------------------- -- GitLab