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

2016-09-15 01:35:52 -04:00 · 2016-09-15 01:35:52 -04:00 · 39608f8a95
parent 8f2cc5bc4d 01a97f6487
commit 39608f8a95
2 changed files with 10 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -274,6 +274,14 @@ endif()

 #### 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
 if(NOT UNIX) # Windows
--- a/depends/protobuf/CMakeLists.txt
+++ b/depends/protobuf/CMakeLists.txt
@ -68,7 +68,7 @@ IF (HAVE_HASH_MAP EQUAL 0)
 ENDIF()

 IF(UNIX)
-    FIND_PACKAGE(Threads)
+	FIND_PACKAGE(Threads REQUIRED)
 ENDIF()

 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h")