Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ci] update libboost version from 1.74 to 1.83 #6582

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

[ci] update libboost version from 1.74 to 1.83 #6582

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
98fa5da
update boost
StrikerRUS Jul 30, 2024
d656b75
update boost in integrated opencl
StrikerRUS Jul 30, 2024
6432925
Update IntegratedOpenCL.cmake
StrikerRUS Jul 30, 2024
b8241fd
Update IntegratedOpenCL.cmake
StrikerRUS Jul 30, 2024
355e26d
64bit build
StrikerRUS Jul 31, 2024
c6ed624
try architecture
StrikerRUS Jul 31, 2024
01555d6
try abbreviate-paths
StrikerRUS Jul 31, 2024
955e32b
try no threading
StrikerRUS Jul 31, 2024
83d6c27
Update IntegratedOpenCL.cmake
StrikerRUS Jul 31, 2024
3b08215
set address-model
StrikerRUS Aug 7, 2024
144f092
Merge branch 'master' into ci/libboost
StrikerRUS Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
set address-model
  • Loading branch information
@StrikerRUS
StrikerRUS authored Aug 7, 2024
commit 3b08215ff694d42e69a2314d7a6051d447769deb
7 changes: 6 additions & 1 deletion cmake/IntegratedOpenCL.cmake
View file
Original file line number Diff line number Diff line change
@@ -58,6 +58,7 @@ ProcessorCount(J)
set(BOOST_BASE "${PROJECT_BINARY_DIR}/Boost")
set(BOOST_INCLUDE "${BOOST_BASE}/source" CACHE PATH "")
set(BOOST_LIBRARY "${BOOST_BASE}/source/stage/lib" CACHE PATH "")
set(BOOST_ADDRESS_MODEL 64)
if(WIN32)
if(MSVC)
if(${MSVC_VERSION} GREATER 1929)
@@ -71,6 +72,9 @@ if(WIN32)
else()
message(FATAL_ERROR "Unrecognized MSVC version number: ${MSVC_VERSION}")
endif()
if("${CMAKE_GENERATOR_PLATFORM}" MATCHES "Win32")
set(BOOST_ADDRESS_MODEL 32)
endif()
list(
APPEND
BOOST_BUILD_BYPRODUCTS
@@ -181,8 +185,9 @@ ExternalProject_Add(
link=static
runtime-link=shared
variant=release
threading=multi
address-model=${BOOST_ADDRESS_MODEL}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To fix the following error on Windows:

CUSTOMBUILD : error : Name clash for '<pC:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost\source\stage\lib>libboost_chrono-vc142-mt-1_83.lib' [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error :  [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error : Tried to build the target twice, with property sets having [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error : these incompatible properties: [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error :  [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error : -  <address-model>32 [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error : -  <address-model>64 [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error :  [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error : Please make sure to have consistent requirements for these [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error : properties everywhere in your project, especially for install [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error : targets. [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]

cxxflags="${BOOST_FLAGS}"
--abbreviate-paths
INSTALL_COMMAND ""
# BUILD_BYPRODUCTS is necessary to support 'Ninja' builds.
# ref:
Loading
Oops, something went wrong.