jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-02 19:43:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compilation under win32; fix installation of lib under win32

Browse source
This commit is contained in:
Fabio Bas 2015-02-13 17:58:20 +01:00
parent e8cb260734
commit 3c285e572c
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
oracle/CMakeLists.txt
View file

@ -207,6 +207,12 @@ IF(WIN32)
# these needs to be relative to CMAKE_INSTALL_PREFIX
set(plugin_dest_dir Plugins)
set(qtconf_dest_dir .)
list(APPEND libSearchDirs ${QT_LIBRARY_DIR})
IF(ZLIB_FOUND)
get_filename_component(ZLIB_DLL_DIR "${ZLIB_INCLUDE_DIRS}/../bin/" REALPATH)
list(APPEND libSearchDirs ${ZLIB_DLL_DIR})
ENDIF()
MESSAGE(STATUS "Oracle: ZLIB dll found at ${ZLIB_DLL_DIR}")
# qt4: codecs, iconengines, imageformats
# qt5: iconengines, imageformats, platforms
@ -225,6 +231,6 @@ Translations = Resources/translations\")
\"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\")
set(BU_CHMOD_BUNDLE_ITEMS ON)
include(BundleUtilities)
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/oracle.exe\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/oracle.exe\" \"\${QTPLUGINS}\" \"${libSearchDirs}\")
" COMPONENT Runtime)
endif()