MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-run zlib and pthread scans on Linux/OS X when the build architecture changes 

Fixes #982, ref #992
develop
lethosor 2016-09-15 10:24:57 -04:00
parent 38cd830abf
commit 869e705549
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
Unescape Escape View File

@ -274,6 +274,13 @@ endif()
#### expose depends #### #### expose depends ####
if(UNIX)
# Rescan for pthread and zlib if the build arch changed
if(NOT "${DFHACK_BUILD_ARCH}" STREQUAL "${DFHACK_BUILD_ARCH_PREV}")
unset(ZLIB_LIBRARY CACHE)
unset(CMAKE_HAVE_PTHREAD_H CACHE)
endif()
endif()
# find and make available libz # find and make available libz
if(NOT UNIX) # Windows if(NOT UNIX) # Windows
@ -407,3 +414,6 @@ set(CPACK_PACKAGE_FILE_NAME "dfhack-${DFHACK_VERSION}-${DFHACK_PACKAGE_PLATFORM_
INCLUDE(CPack) INCLUDE(CPack)
#INCLUDE(FindSphinx.cmake) #INCLUDE(FindSphinx.cmake)
# Store old build arch
SET(DFHACK_BUILD_ARCH_PREV "${DFHACK_BUILD_ARCH}" CACHE STRING "Previous build architecture" FORCE)