From e4a80ca59236477c1c0d6f129fdafbb526196734 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Thu, 18 Jul 2019 15:37:51 +0200
Subject: [PATCH] Cleanup of cmake code
---
CMakeLists.txt | 9 +--------
cmake/DD4hep.cmake | 21 +--------------------
2 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index acbd81484..c2b51c268 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,14 +16,7 @@ SET( DD4hep_VERSION_PATCH 0 )
# Basic project setup #
#######################
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
-
-if(NOT CMAKE_INSTALL_LIBDIR)
- MESSAGE(STATUS "Setting CMAKE_INSTALL_LIBDIR to lib")
- SET(CMAKE_INSTALL_LIBDIR lib)
-endif()
-MESSAGE(STATUS "CMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}")
-
+set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake )
IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
SET( CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR} CACHE PATH
diff --git a/cmake/DD4hep.cmake b/cmake/DD4hep.cmake
index e55f6b7d8..807adba62 100644
--- a/cmake/DD4hep.cmake
+++ b/cmake/DD4hep.cmake
@@ -77,7 +77,7 @@ endfunction()
#---------------------------------------------------------------------------------------------------
# dd4hep_generate_rootmap(library)
#
-# Create the .rootmap file needed by the plug-in system.
+# Create the .components file needed by the plug-in system.
#---------------------------------------------------------------------------------------------------
function(dd4hep_generate_rootmap library)
if(APPLE)
@@ -130,22 +130,3 @@ function(dd4hep_generate_rootmap_apple library)
# for now do the same for apple that is done for the rest
dd4hep_generate_rootmap_notapple( ${library} )
endfunction()
-#---------------------------------------------------------------------------------------------------
-# dd4hep_install_library(library)
-#
-# Install library
-#---------------------------------------------------------------------------------------------------
-function(dd4hep_install_library library)
- set(installfile ${library}.install)
-
- set(rootmapfile ${CMAKE_SHARED_MODULE_PREFIX}${library}.rootmap)
-
- set(libname ${CMAKE_SHARED_MODULE_PREFIX}${library}${CMAKE_SHARED_MODULE_SUFFIX})
-
- add_custom_command(OUTPUT ${rootmapfile}
- SET ( ENV{LD_LIBRARY_PATH} ./:$ENV{LD_LIBRARY_PATH} )
- COMMAND echo
- ${library} ${LIBRARY_OUTPUT_DIR}
- DEPENDS ${library})
- add_custom_target(${library}Install ALL DEPENDS ${installfile})
-endfunction()
--
GitLab