From 37cc14256ab545a31c6631971887a64141a09502 Mon Sep 17 00:00:00 2001 From: Mederic Fourmy <mederic.fourmy@gmail.com> Date: Mon, 16 May 2022 11:54:25 +0200 Subject: [PATCH] Fix merge artefacts in cmake file --- CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7cf73c..5fffec1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,12 +81,8 @@ 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 +FIND_PACKAGE(Eigen3 3.3 REQUIRED CONFIG) # Define the directory where will be the configured config.h SET(WOLF_CONFIG_DIR ${PROJECT_BINARY_DIR}/conf/${PROJECT_NAME}/internal) -- GitLab