Skip to content
Snippets Groups Projects
Commit 37cc1425 authored by Mederic Fourmy's avatar Mederic Fourmy
Browse files

Fix merge artefacts in cmake file

parent 6d2e3063
No related branches found
No related tags found
1 merge request!1Resolve "Adapt to core cmake refactor"
...@@ -81,12 +81,8 @@ string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER) ...@@ -81,12 +81,8 @@ string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
#find dependencies. #find dependencies.
# ============EXAMPLE================== # ============EXAMPLE==================
<<<<<<< Updated upstream
FIND_PACKAGE(wolfcore REQUIRED)
FIND_PACKAGE(Eigen3 3.3 REQUIRED)
=======
FIND_PACKAGE(wolfcore REQUIRED CONFIG) FIND_PACKAGE(wolfcore REQUIRED CONFIG)
>>>>>>> Stashed changes FIND_PACKAGE(Eigen3 3.3 REQUIRED CONFIG)
# Define the directory where will be the configured config.h # Define the directory where will be the configured config.h
SET(WOLF_CONFIG_DIR ${PROJECT_BINARY_DIR}/conf/${PROJECT_NAME}/internal) SET(WOLF_CONFIG_DIR ${PROJECT_BINARY_DIR}/conf/${PROJECT_NAME}/internal)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment