Skip to content

fix minizip cmake paths #54

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 12, 2022
Merged

fix minizip cmake paths #54

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
16 changes: 9 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,10 +499,12 @@ 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_RECURSE ZIPPER_SOURCES
file(GLOB ZIPPER_SOURCES
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src
${CMAKE_CURRENT_SOURCE_DIR}/submodules/zipper/*.cpp
${CMAKE_CURRENT_SOURCE_DIR}/submodules/zipper/*.h
${CMAKE_CURRENT_SOURCE_DIR}/submodules/zipper/zipper/*.cpp
${CMAKE_CURRENT_SOURCE_DIR}/submodules/zipper/zipper/*.h
${CMAKE_CURRENT_SOURCE_DIR}/submodules/zipper/zipper/tps/*.cpp
${CMAKE_CURRENT_SOURCE_DIR}/submodules/zipper/zipper/tps/*.h
)

set(COMBINE_SOURCES ${COMBINE_SOURCES} ${ZIPPER_SOURCES})
Expand All @@ -520,17 +522,17 @@ if (LIBSBML_LIBRARY)
CHECK_FUNCTION_EXISTS(zipOpen3 LIBSBML_HAS_MINIZIP)
endif()

if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/minizip AND NOT LIBSBML_HAS_MINIZIP)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src/minizip)
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/submodules/zipper/minizip AND NOT LIBSBML_HAS_MINIZIP)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/submodules/zipper/minizip)

file(GLOB MINIZIP_SOURCES
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src
${CMAKE_CURRENT_SOURCE_DIR}/src/minizip/*.c
${CMAKE_CURRENT_SOURCE_DIR}/submodules/zipper/minizip/*.c
)

if (UNIX AND NOT CYGWIN)
list(REMOVE_ITEM MINIZIP_SOURCES
minizip/iowin32.c
../submodules/zipper/minizip/iowin32.c
)
endif()

Expand Down