diff --git a/CMakeLists.txt b/CMakeLists.txt index 49ebe7f9..f51681fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -533,7 +533,6 @@ if(NOT WIN32) ) endif() set(BOOST_TOOLSET clang) - set(BOOST_CONFIGURE_INSTALL_DIR ${SDK_INSTALL_DIR}) set(BOOST_OSX_SYSROOT ${CMAKE_OSX_SYSROOT}) # strip concrete mac osx directory to allow boost build the detection of # available SDKs. @@ -553,7 +552,6 @@ else() list(APPEND BOOST_CONFIGURE_FLAGS define=BOOST_USE_WINAPI_VERSION=BOOST_WINAPI_VERSION_WINXP) endif() set(BOOST_TOOLSET msvc-${_VS_PLATFORM_TOOLSET_VERSION}) - set(BOOST_CONFIGURE_INSTALL_DIR ${SDK_INSTALL_DIR}/Boost) set(BOOST_OSX_SYSROOT "") endif() string(SUBSTRING "${PYTHON_VERSION}" 0 3 PYTHON_VERSION) @@ -619,7 +617,7 @@ ExternalProject_Add(boost -s ZLIB_INCLUDE=${SDK_INSTALL_DIR}/include -s ZLIB_LIBRARY_PATH=${SDK_INSTALL_DIR}/lib INSTALL_COMMAND "" - INSTALL_DIR ${BOOST_CONFIGURE_INSTALL_DIR} + INSTALL_DIR ${SDK_INSTALL_DIR} ) list(APPEND DIST_PACK_TARGETS boost) diff --git a/ChangeLog.md b/ChangeLog.md index 38730393..205dd4f1 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -8,6 +8,7 @@ Notable changes to the FreeOrionSDK project will be documented in this file. - Use `j` instead of `y` when unpacking the SDK in MacOSX bootstrap. - Install zlib headers in the default location for the Windows SDK. - Install libpng headers in the default location for the Windows SDK. +- Install Boost into root directory of the Windows SDK. ## [4] - 2016-02-17