Skip to content

fix paths in CMakeLists.txt when including zipper sources from the submodule #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fbergmann merged 1 commit into from
Oct 10, 2022
Merged

fix paths in CMakeLists.txt when including zipper sources from the submodule #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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})
Expand Down