build_environment: buildfixes for boost
authorRay Molenkamp <github@lazydodo.com>
Sun, 19 Aug 2018 17:37:16 +0000 (11:37 -0600)
committerRay Molenkamp <github@lazydodo.com>
Sun, 19 Aug 2018 17:44:46 +0000 (11:44 -0600)
Disable hardcoded 64 bit build.

build_files/build_environment/cmake/boost.cmake

index 9be6ea9f01198b4aa8104c2d8c58c0274bd6b41d..959a6e2263737343e323ca9fd765e80c939df39c 100644 (file)
@@ -16,6 +16,8 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
 #
 # ***** END GPL LICENSE BLOCK *****
 
+set(BOOST_ADDRESS_MODEL 64)
+
 if(WIN32)
        if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
                set(PYTHON_ARCH x64)
 if(WIN32)
        if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
                set(PYTHON_ARCH x64)
@@ -25,6 +27,7 @@ if(WIN32)
                set(PYTHON_ARCH x86)
                set(PYTHON_ARCH2 win32)
                set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/win32/)
                set(PYTHON_ARCH x86)
                set(PYTHON_ARCH2 win32)
                set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/win32/)
+               set(BOOST_ADDRESS_MODEL 32)
        endif()
        if(MSVC14)
                set(BOOST_TOOLSET toolset=msvc-14.0)
        endif()
        if(MSVC14)
                set(BOOST_TOOLSET toolset=msvc-14.0)
@@ -45,7 +48,7 @@ if(WIN32)
        #set(BOOST_WITH_PYTHON --with-python)
        set(BOOST_HARVEST_CMD   ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
        if(BUILD_MODE STREQUAL Release)
        #set(BOOST_WITH_PYTHON --with-python)
        set(BOOST_HARVEST_CMD   ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
        if(BUILD_MODE STREQUAL Release)
-               set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_60/ ${HARVEST_TARGET}/boost/include/)
+               set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_68/ ${HARVEST_TARGET}/boost/include/)
        endif()
 
 elseif(APPLE)
        endif()
 
 elseif(APPLE)
@@ -78,9 +81,6 @@ set(BOOST_OPTIONS
        ${BOOST_TOOLSET}
 )
 
        ${BOOST_TOOLSET}
 )
 
-       set(BOOST_ADDRESS_MODEL 64)
-
-
 string(TOLOWER ${BUILD_MODE} BOOST_BUILD_TYPE)
 
 ExternalProject_Add(external_boost
 string(TOLOWER ${BUILD_MODE} BOOST_BUILD_TYPE)
 
 ExternalProject_Add(external_boost