Commit 8553d603 authored by Jeremy Cohen's avatar Jeremy Cohen

Updating third party boost to 1.73, force third party zlib on win32

parent 172db761
...@@ -59,7 +59,7 @@ MARK_AS_ADVANCED(Boost_USE_MULTITHREADED) ...@@ -59,7 +59,7 @@ MARK_AS_ADVANCED(Boost_USE_MULTITHREADED)
IF (WIN32) IF (WIN32)
ADD_DEFINITIONS("-DBOOST_ALL_NO_LIB") ADD_DEFINITIONS("-DBOOST_ALL_DYN_LIB")
ENDIF() ENDIF()
IF (THIRDPARTY_BUILD_BOOST) IF (THIRDPARTY_BUILD_BOOST)
...@@ -123,8 +123,8 @@ IF (THIRDPARTY_BUILD_BOOST) ...@@ -123,8 +123,8 @@ IF (THIRDPARTY_BUILD_BOOST)
EXTERNALPROJECT_ADD( EXTERNALPROJECT_ADD(
boost boost
PREFIX ${TPSRC} PREFIX ${TPSRC}
URL ${TPURL}/boost_1_57_0.tar.bz2 URL ${TPURL}/boost_1_73_0.tar.bz2
URL_MD5 "1be49befbdd9a5ce9def2983ba3e7b76" URL_MD5 "9273c8c4576423562bbe84574b07b2bd"
STAMP_DIR ${TPBUILD}/stamp STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC} DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPBUILD}/boost SOURCE_DIR ${TPBUILD}/boost
...@@ -144,16 +144,18 @@ IF (THIRDPARTY_BUILD_BOOST) ...@@ -144,16 +144,18 @@ IF (THIRDPARTY_BUILD_BOOST)
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )
ELSE () ELSE ()
IF (CMAKE_CL_64) MESSAGE(STATUS "Windows MSVC build - toolset is: ${TOOLSET_CMDLINE}")
IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(ADDRESS_MODEL 64) SET(ADDRESS_MODEL 64)
ELSE() ELSE()
SET(ADDRESS_MODEL 32) SET(ADDRESS_MODEL 32)
ENDIF() ENDIF()
MESSAGE(STATUS "Windows MSVC build - address model is: ${ADDRESS_MODEL}")
EXTERNALPROJECT_ADD( EXTERNALPROJECT_ADD(
boost boost
PREFIX ${TPSRC} PREFIX ${TPSRC}
URL ${TPURL}/boost_1_57_0.tar.bz2 URL URL ${TPURL}/boost_1_73_0.tar.bz2
URL_MD5 "1be49befbdd9a5ce9def2983ba3e7b76" URL_MD5 "9273c8c4576423562bbe84574b07b2bd"
STAMP_DIR ${TPBUILD}/stamp STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC} DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPBUILD}/boost SOURCE_DIR ${TPBUILD}/boost
......
...@@ -8,11 +8,19 @@ ...@@ -8,11 +8,19 @@
# Find a system ZLIB library. If not found enable the THIRDPARTY_BUILD_ZLIB # Find a system ZLIB library. If not found enable the THIRDPARTY_BUILD_ZLIB
# option. # option.
FIND_PACKAGE(ZLIB QUIET) # On Windows, we want to force the use of third party zlib
IF (ZLIB_FOUND AND NOT ZLIB_VERSION_PATCH LESS 7) # since this will be used with the boost build if boost is being
SET(BUILD_ZLIB OFF) # built as a third party lib
ELSE () IF(WIN32)
MESSAGE(STATUS "On a WIN32 platform, zlib will be built as a third party library...")
SET(BUILD_ZLIB ON) SET(BUILD_ZLIB ON)
ELSE()
FIND_PACKAGE(ZLIB QUIET)
IF (ZLIB_FOUND AND NOT ZLIB_VERSION_PATCH LESS 7)
SET(BUILD_ZLIB OFF)
ELSE ()
SET(BUILD_ZLIB ON)
ENDIF()
ENDIF() ENDIF()
OPTION(THIRDPARTY_BUILD_ZLIB "Build ZLib library" ${BUILD_ZLIB}) OPTION(THIRDPARTY_BUILD_ZLIB "Build ZLib library" ${BUILD_ZLIB})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment