Merge branch 'MacOS' into 'master'

Fix MacOS build

See merge request hallc/analyzer_software/hcana!1

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

@@ -15,3 +15,10 @@ include("@PACKAGE_TARGETS_FILE@")
 
 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("Podd: 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()