From acd2a394056b46bde2622af8dba2255571db9b36 Mon Sep 17 00:00:00 2001 From: jcasals <jcasals@iri.upc.edu> Date: Thu, 16 Jul 2020 09:21:04 +0200 Subject: [PATCH] Adapt to rename wolf -> wolfcore --- CMakeLists.txt | 6 +++--- cmake_modules/wolfgnssConfig.cmake | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a72b1a95b..e05b69ceb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,7 +97,7 @@ ENDIF(BUILD_EXAMPLES OR BUILD_TESTS) #find dependencies. # ============EXAMPLE================== -FIND_PACKAGE(wolf REQUIRED) +FIND_PACKAGE(wolfcore REQUIRED) FIND_PACKAGE(gnss_utils REQUIRED) #FIND_PATH( @@ -133,7 +133,7 @@ include_directories("${PROJECT_BINARY_DIR}/conf") #INCLUDES SECTION # ============================== -INCLUDE_DIRECTORIES(${wolf_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES(${wolfcore_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${gnss_utils_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(BEFORE "include") @@ -270,7 +270,7 @@ endif() #Link the created libraries #===============EXAMPLE========================= -TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${wolf_LIBRARIES}) +TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${wolfcore_LIBRARIES}) TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${gnss_utils_LIBRARIES}) diff --git a/cmake_modules/wolfgnssConfig.cmake b/cmake_modules/wolfgnssConfig.cmake index db8f69e9c..5d041b978 100644 --- a/cmake_modules/wolfgnssConfig.cmake +++ b/cmake_modules/wolfgnssConfig.cmake @@ -70,14 +70,14 @@ FIND_PACKAGE(gnss_utils REQUIRED) list(APPEND wolfgnss_INCLUDE_DIRS ${gnss_utils_INCLUDE_DIRS}) list(APPEND wolfgnss_LIBRARIES ${gnss_utils_LIBRARY}) if(NOT wolf_FOUND) - FIND_PACKAGE(wolf REQUIRED) + FIND_PACKAGE(wolfcore REQUIRED) #We reverse in order to insert at the start list(REVERSE wolfgnss_INCLUDE_DIRS) - list(APPEND wolfgnss_INCLUDE_DIRS ${wolf_INCLUDE_DIRS}) + list(APPEND wolfgnss_INCLUDE_DIRS ${wolfcore_INCLUDE_DIRS}) list(REVERSE wolfgnss_INCLUDE_DIRS) list(REVERSE wolfgnss_LIBRARIES) - list(APPEND wolfgnss_LIBRARIES ${wolf_LIBRARIES}) + list(APPEND wolfgnss_LIBRARIES ${wolfcore_LIBRARIES}) list(REVERSE wolfgnss_LIBRARIES) endif() \ No newline at end of file -- GitLab