diff --git a/CMakeLists.txt b/CMakeLists.txt index fbd3bad99b2c385070541c6ebfd42f1b28c07e5d..a7cf73c65391c57482d149095cd3748f48f7e748 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,8 +81,12 @@ string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER) #find dependencies. # ============EXAMPLE================== +<<<<<<< Updated upstream FIND_PACKAGE(wolfcore REQUIRED) FIND_PACKAGE(Eigen3 3.3 REQUIRED) +======= +FIND_PACKAGE(wolfcore REQUIRED CONFIG) +>>>>>>> Stashed changes # Define the directory where will be the configured config.h SET(WOLF_CONFIG_DIR ${PROJECT_BINARY_DIR}/conf/${PROJECT_NAME}/internal) @@ -274,7 +278,7 @@ INSTALL(DIRECTORY ${SPDLOG_INCLUDE_DIRS} DESTINATION "include/iri-algorithms/") export(PACKAGE ${PLUGIN_NAME}) -FIND_PACKAGE(Doxygen) +FIND_PACKAGE(Doxygen MODULE) FIND_PATH(IRI_DOC_DIR doxygen.conf ${CMAKE_SOURCE_DIR}/doc/iri_doc/) IF (IRI_DOC_DIR)