From 45fdf42802084536896ef321989e1a59753c7796 Mon Sep 17 00:00:00 2001 From: Liam Keegan Date: Mon, 10 Oct 2022 15:29:46 +0200 Subject: [PATCH] fix paths in CMakeLists.txt when including zipper sources from the submodule - use recursive glob to also include sources from zipper minizip submodule --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fb839cf..42fe01c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -309,7 +309,7 @@ find_package(LIBSBML REQUIRED) # detect zipper library if sources are not included -if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/zipper) +if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/submodules/zipper) find_package(ZIPPER REQUIRED) @@ -495,14 +495,14 @@ file(GLOB COMBINE_SOURCES source_group(combine FILES ${COMBINE_SOURCES} ${COMBINE_HEADERS}) # if we have the zipper sources, include them directly -if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/zipper) - include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src/zipper) - include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src) +if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/submodules/zipper) + include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/submodules/zipper/zipper) + include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/submodules/zipper) - file(GLOB ZIPPER_SOURCES + file(GLOB_RECURSE ZIPPER_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src - ${CMAKE_CURRENT_SOURCE_DIR}/src/zipper/*.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/zipper/*.h + ${CMAKE_CURRENT_SOURCE_DIR}/submodules/zipper/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/submodules/zipper/*.h ) set(COMBINE_SOURCES ${COMBINE_SOURCES} ${ZIPPER_SOURCES})