Merge branch 'master' of eicweb.phy.anl.gov:jlab/hcana

CMakeLists.txt

@@ -4,6 +4,8 @@ project(hcana VERSION 0.90 LANGUAGES CXX)
 
 option(HCANA_BUILTIN_PODD "Use built-in Podd submodule (default: YES)" OFF)
 
+include(cmake/os.cmake)
+
 find_package(ROOT 6.0 REQUIRED CONFIG)
 include(${ROOT_USE_FILE})
 

cmake/HCANAConfig.cmake.in

-@PACKAGE_INIT@
-
-include("@PACKAGE_TARGETS_INSTALL_PATH@")
-
-check_required_components(HCANA)
-
-find_package(PODD REQUIRED)
-message(STATUS "Found HCANA")
-
-#get_filename_component(HCANA_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-#include(CMakeFindDependencyMacro)
-#
-#list(APPEND CMAKE_MODULE_PATH ${HCANA_CMAKE_DIR})
-#
-## NOTE Had to use find_package because find_dependency does not support COMPONENTS or MODULE until 3.8.0
-#
-##find_dependency(Boost 1.55 REQUIRED COMPONENTS regex)
-##find_dependency(RapidJSON 1.0 REQUIRED MODULE)
-##find_package(Boost 1.55 REQUIRED COMPONENTS regex)
-##find_package(RapidJSON 1.0 REQUIRED MODULE)
-#list(REMOVE_AT CMAKE_MODULE_PATH -1)
-#
-#if(NOT TARGET HCANA::PODD)
-#    include("${HCANA_CMAKE_DIR}/PODDTargets.cmake")
-#endif()
-#
-#set(HCANA_LIBRARIES PODD::PODD)

cmake/hcanaConfig.cmake.in

@@ -9,9 +9,16 @@ if(IS_DIRECTORY "@PACKAGE_INSTALL_CONFIGDIR@/Modules")
   list(APPEND CMAKE_MODULE_PATH "@PACKAGE_INSTALL_CONFIGDIR@/Modules")
 endif()
 
-@FIND_DEPENDENCY_COMMANDS@
-
 include("@PACKAGE_TARGETS_FILE@")
 
+@FIND_DEPENDENCY_COMMANDS@
+
 check_required_components(@PROJECT_NAME_UC@)
 
+## Extra rpath stuff for MacOS
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  set(CMAKE_INSTALL_RPATH 
+    ${CMAKE_INSTALL_RPATH} 
+    "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@")
+  message("hcana: set rpath to ${CMAKE_INSTALL_RPATH}")
+endif()

cmake/os.cmake

-## OSX/homebrew version of root6 installs its cmake macros in a non-standard
-## location. This might be an issue on other systems as well.
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} $ENV{ROOTSYS}/etc/root/cmake)
-endif()
-
-## Get rid of rpath warning on OSX
+## Set correct rpath on MacOs
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(CMAKE_MACOSX_RPATH 1)
+  set(CMAKE_INSTALL_RPATH
+    ${CMAKE_INSTALL_RPATH} 
+    "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+message("Setting RPath to ${CMAKE_INSTALL_RPATH}")
 endif()