Skip to content

Commit

Permalink
Install Boost into root directory of the Windows SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianbroher committed Mar 14, 2017
1 parent ee7b909 commit 1dbccc0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 1 addition & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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)
Expand Down Expand Up @@ -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)

Expand Down
1 change: 1 addition & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1dbccc0

Please sign in to comment.