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

Merge remote-tracking branch 'dseguin/fix_cmake_64_linux' into develop

develop
lethosor 2016-09-15 01:35:52 -04:00
parent 8f2cc5bc4d 01a97f6487
commit 39608f8a95
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
Unescape Escape View File

@ -274,6 +274,14 @@ endif()
#### expose depends #### #### expose depends ####
# check for change in arch (32<->64)
if(UNIX)
GET_PROPERTY(DFHACK_CACHED_ARCH CACHE STRING PROPERTY DFHACK_BUILD_ARCH)
if(NOT "${DFHACK_BUILD_ARCH}" STREQUAL "${DFHACK_CACHED_ARCH}")
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

2
depends/protobuf/CMakeLists.txt
Unescape Escape View File

@ -68,7 +68,7 @@ IF (HAVE_HASH_MAP EQUAL 0)
ENDIF() ENDIF()
IF(UNIX) IF(UNIX)
FIND_PACKAGE(Threads) FIND_PACKAGE(Threads REQUIRED)
ENDIF() ENDIF()
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h") CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h")