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

Fix boost naming for mac & unix debug builds #2317

Merged
merged 12 commits into from
Dec 20, 2021
Merged

Fix boost naming for mac & unix debug builds #2317

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f03611e
Fix boost lib naming
Jul 21, 2021
fbdf756
Fixed debug postfix for non-python builds
Jul 23, 2021
169aaec
Removed warning that was only enabled for mac debug
Jul 23, 2021
89deb5a
Undid changes to src cmake lists
Jul 26, 2021
43ea70f
Merge branch 'master' into boost_debug_fix
dcwhite Aug 2, 2021
c0faf50
Merge branch 'master' into boost_debug_fix
tarkpate Aug 28, 2021
2fe8c7e
Merge branch 'master' into boost_debug_fix
dcwhite Oct 1, 2021
9b5a1a4
Merge branch 'master' into boost_debug_fix
dcwhite Oct 15, 2021
6efdc0c
Merge branch 'master' into boost_debug_fix
dcwhite Oct 15, 2021
7fbfb1d
Merge branch 'master' into boost_debug_fix
jessdtate Nov 19, 2021
d11e516
Merge branch 'master' into boost_debug_fix
jessdtate Dec 3, 2021
6b67a0d
Merge branch 'master' into boost_debug_fix
jessdtate Dec 10, 2021
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
12 changes: 10 additions & 2 deletions Superbuild/UseBoost.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ if(WIN32)
endif()
set(boost_LIB_PREFIX "lib")
else()
set(DEBUG_POSTFIX "-yd")
if(BUILD_WITH_PYTHON)
set(DEBUG_POSTFIX "-yd")
else()
set(DEBUG_POSTFIX "-d")
endif()
set(boost_LIB_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX})
if(${arm64Supported})
set(PLATFORM_SUFFIX "a64")
Expand All @@ -39,7 +43,11 @@ foreach(lib ${SCI_BOOST_LIBRARY})
add_library(${lib} STATIC IMPORTED GLOBAL)

if((APPLE OR UNIX) AND CMAKE_BUILD_TYPE MATCHES "Debug")
set(FULL_LIB_NAME "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}${lib}${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
if(${lib} MATCHES "boost_python-mt")
set(FULL_LIB_NAME "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python${USER_PYTHON_VERSION_MAJOR}${USER_PYTHON_VERSION_MINOR}-mt${DEBUG_POSTFIX}-${PLATFORM_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
else()
set(FULL_LIB_NAME "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}${lib}${DEBUG_POSTFIX}-${PLATFORM_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
endif()
elseif(APPLE OR UNIX)
if(${lib} MATCHES "boost_python-mt")
set(FULL_LIB_NAME "${SCI_BOOST_LIBRARY_DIR}/${boost_LIB_PREFIX}boost_python${USER_PYTHON_VERSION_MAJOR}${USER_PYTHON_VERSION_MINOR}-mt-${PLATFORM_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
Expand Down