Skip to content
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

Move ZLib inline fixup-install code to a cmake 'patch' script #602

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Move ZLib inline fixup-install code to a cmake 'patch' script #602

Show file tree
Hide file tree
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
32 changes: 6 additions & 26 deletions CMake/External_ZLib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,12 @@ ExternalProject_Add(ZLib
-DBUILD_SHARED_LIBS:BOOL=ON
)

if(WIN32)
# Copy zlib to zdll for Qt
ExternalProject_Add_Step(ZLib fixup-install
COMMAND ${CMAKE_COMMAND} -E copy
${fletch_BUILD_INSTALL_PREFIX}/lib/zlib.lib
${fletch_BUILD_INSTALL_PREFIX}/lib/zdll.lib
DEPENDEES install
)
elseif(NOT APPLE)
# For Linux machines
ExternalProject_Add_Step(ZLib fixup-install
COMMAND ${CMAKE_COMMAND} -E copy
${fletch_BUILD_INSTALL_PREFIX}/lib/libz.so
${fletch_BUILD_INSTALL_PREFIX}/lib/libzlib.so
DEPENDEES install
)
else()
# APPLE
ExternalProject_Add_Step(ZLib fixup-install
COMMAND ${CMAKE_COMMAND} -E copy
${fletch_BUILD_INSTALL_PREFIX}/lib/libz.dylib
${fletch_BUILD_INSTALL_PREFIX}/lib/libzlib.dylib
DEPENDEES install
)
endif()

ExternalProject_Add_Step(ZLib fixup-install
COMMAND ${CMAKE_COMMAND}
-Dfletch_BUILD_INSTALL_PREFIX:PATH=${fletch_BUILD_INSTALL_PREFIX}
-P ${fletch_SOURCE_DIR}/Patches/ZLib/fixup-install.cmake
DEPENDEES install
)
fletch_external_project_force_install(PACKAGE ZLib STEP_NAMES install fixup-install)

set(ZLIB_ROOT ${fletch_BUILD_INSTALL_PREFIX} CACHE PATH "" FORCE)
Expand Down
27 changes: 27 additions & 0 deletions Patches/ZLib/fixup-install.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Make a copy of built libraries with Qt expected name

if(WIN32)
if(EXISTS ${fletch_BUILD_INSTALL_PREFIX}/lib/zlib.lib)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${fletch_BUILD_INSTALL_PREFIX}/lib/zlib.lib ${fletch_BUILD_INSTALL_PREFIX}/lib/zdll.lib)
endif()
if(EXISTS ${fletch_BUILD_INSTALL_PREFIX}/lib/zlib${CMAKE_DEBUG_POSTFIX}.lib)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${fletch_BUILD_INSTALL_PREFIX}/lib/zlib${CMAKE_DEBUG_POSTFIX}.lib ${fletch_BUILD_INSTALL_PREFIX}/lib/zdll${CMAKE_DEBUG_POSTFIX}.lib)
endif()
elseif(NOT APPLE)
# For Linux machines
if(EXISTS ${fletch_BUILD_INSTALL_PREFIX}/lib/libz.lib)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${fletch_BUILD_INSTALL_PREFIX}/lib/libz.lib ${fletch_BUILD_INSTALL_PREFIX}/lib/libzlib.lib)
endif()
if(EXISTS ${fletch_BUILD_INSTALL_PREFIX}/lib/libz${CMAKE_DEBUG_POSTFIX}.lib)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${fletch_BUILD_INSTALL_PREFIX}/lib/libz${CMAKE_DEBUG_POSTFIX}.lib ${fletch_BUILD_INSTALL_PREFIX}/lib/libzlib${CMAKE_DEBUG_POSTFIX}.lib)
endif()
else()
# APPLE

if(EXISTS ${fletch_BUILD_INSTALL_PREFIX}/lib/libz.dylib)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${fletch_BUILD_INSTALL_PREFIX}/lib/libz.dylib ${fletch_BUILD_INSTALL_PREFIX}/lib/libzlib.dylib)
endif()
if(EXISTS ${fletch_BUILD_INSTALL_PREFIX}/lib/libz${CMAKE_DEBUG_POSTFIX}.dylib)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${fletch_BUILD_INSTALL_PREFIX}/lib/libz${CMAKE_DEBUG_POSTFIX}.dylib ${fletch_BUILD_INSTALL_PREFIX}/lib/libzlib${CMAKE_DEBUG_POSTFIX}.dylib)
endif()
endif()