diff --git a/cmake/HCANAConfig.cmake.in b/cmake/HCANAConfig.cmake.in deleted file mode 100644 index 57b242a892bb56cb74876ab27c928a6054f5427a..0000000000000000000000000000000000000000 --- a/cmake/HCANAConfig.cmake.in +++ /dev/null @@ -1,27 +0,0 @@ -@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) diff --git a/cmake/hcanaConfig.cmake.in b/cmake/hcanaConfig.cmake.in index bc5d72606a9de51179600b9a9b6b58452263218d..480c7a12cbe837ce8d9cb407337df67bfa1bb0d0 100644 --- a/cmake/hcanaConfig.cmake.in +++ b/cmake/hcanaConfig.cmake.in @@ -9,10 +9,10 @@ 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 @@ -20,5 +20,5 @@ 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}") + message("hcana: set rpath to ${CMAKE_INSTALL_RPATH}") endif()