Merge branch 'cmake-fixes' into 'master'

Add a proper EveryBeamConfig file

See merge request RD/EveryBeam!102

CMake/EveryBeamConfig.cmake.in

+# This is the cmake config script for EveryBeam.
+#
+# It sets the following variables:
+# - EVERYBEAM_INCLUDE_DIR
+# - EVERYBEAM_LIB
+# - EVERYBEAM_LIB_PATH
+# - EVERYBEAM_VERSION[_MAJOR/_MINOR/_PATCH]
+# - EVERYBEAM_FOUND
+# - EVERYBEAM_ROOT_DIR
+
+include("${CMAKE_CURRENT_LIST_DIR}/EveryBeamTargets.cmake")
+
+# Compute path
+get_filename_component(_EVERYBEAM_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_EVERYBEAM_CMAKE_DIR_ABS "${_EVERYBEAM_CMAKE_DIR}" ABSOLUTE)
+get_filename_component(_EVERYBEAM_ROOT_DIR "${_EVERYBEAM_CMAKE_DIR_ABS}/../.." ABSOLUTE)
+
+set(EVERYBEAM_ROOT_DIR "${_EVERYBEAM_ROOT_DIR}"
+    CACHE PATH "EveryBeam root (prefix) directory")
+
+set(EVERYBEAM_INCLUDE_DIR "${EVERYBEAM_ROOT_DIR}/include"
+    CACHE PATH "EveryBeam include directory")
+
+set(EVERYBEAM_LIB_PATH "${EVERYBEAM_ROOT_DIR}/lib"
+    CACHE PATH "EveryBeam library directory")
+
+find_library(EVERYBEAM_LIB everybeam PATH ${EVERYBEAM_LIB_PATH} NO_DEFAULT_PATH
+             DOC "EveryBeam library directory")
+message(STATUS "Found EveryBeam @EVERYBEAM_VERSION@.")
+message(STATUS "  EveryBeam include dir: ${EVERYBEAM_INCLUDE_DIR}")
+message(STATUS "  EveryBeam lib: ${EVERYBEAM_LIB}")
+
+# All capitals for version and found variables
+set(EVERYBEAM_VERSION "@EVERYBEAM_VERSION@")
+set(EVERYBEAM_VERSION_MAJOR @EVERYBEAM_VERSION_MAJOR@)
+set(EVERYBEAM_VERSION_MINOR @EVERYBEAM_VERSION_MINOR@)
+set(EVERYBEAM_VERSION_PATCH @EVERYBEAM_VERSION_MINOR@)
+set(EVERYBEAM_FOUND 1)
+
+unset(_EVERYBEAM_ROOT_DIR)
+unset(_EVERYBEAM_CMAKE_DIR)
+unset(_EVERYBEAM_CMAKE_DIR_ABS)

cpp/CMakeLists.txt

@@ -86,18 +86,23 @@ install (FILES
   options.h
 DESTINATION "include/${CMAKE_PROJECT_NAME}")
 
+# TODO: not sure whether this is needed at all
 install(
   EXPORT EveryBeamTargets
-  FILE EveryBeamConfig.cmake
+  FILE EveryBeamTargets.cmake
   NAMESPACE EveryBeam::
   DESTINATION "lib/${projectname}"
 )
 
-# Configure and install the ConfigVersion.cmake
-configure_file(${CMAKE_SOURCE_DIR}/CMake/EveryBeamConfigVersion.cmake.in
-  "${CMAKE_BINARY_DIR}/EveryBeamConfigVersion.cmake" @ONLY)
+# Set-up cmake configuration files
+configure_file("${CMAKE_SOURCE_DIR}/CMake/EveryBeamConfig.cmake.in"
+    "${CMAKE_BINARY_DIR}/CMakeFiles/EveryBeamConfig.cmake" @ONLY)
+configure_file("${CMAKE_SOURCE_DIR}/CMake/EveryBeamConfigVersion.cmake.in"
+  "${CMAKE_BINARY_DIR}/CMakeFiles/EveryBeamConfigVersion.cmake" @ONLY)
+
 install(
   FILES
-  "${CMAKE_BINARY_DIR}/EveryBeamConfigVersion.cmake"
+  "${CMAKE_BINARY_DIR}/CMakeFiles/EveryBeamConfig.cmake"
+  "${CMAKE_BINARY_DIR}/CMakeFiles/EveryBeamConfigVersion.cmake"
   DESTINATION "lib/${projectname}"
 )
\ No newline at end of file