boost/boost_install
2
0
Fork 0
mirror of https://github.com/boostorg/boost_install.git synced 2026-01-19 04:02:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix Boost_USE_STATIC_LIBS not overriding BUILD_SHARED_LIBS

Browse Source
This commit is contained in:
Peter Dimov
2019-04-23 07:30:56 +03:00
parent 6d641ea883
commit 160c7cb2b2
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
boost-install.jam
View File

@@ -180,14 +180,16 @@ rule generate-cmake-variant- ( target : sources * : properties * )
{
print.text
"if(NOT \"${Boost_USE_STATIC_LIBS}\" STREQUAL \"\" AND NOT Boost_USE_STATIC_LIBS)"
" _BOOST_SKIPPED(\"$(fname)\" \"static, Boost_USE_STATIC_LIBS=${Boost_USE_STATIC_LIBS}\")"
" return()"
"endif()"
""
"if(BUILD_SHARED_LIBS)"
" _BOOST_SKIPPED(\"$(fname)\" \"static, BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}, set Boost_USE_STATIC_LIBS=ON to override\")"
" return()"
"if(DEFINED Boost_USE_STATIC_LIBS)"
" if(NOT Boost_USE_STATIC_LIBS)"
" _BOOST_SKIPPED(\"$(fname)\" \"static, Boost_USE_STATIC_LIBS=${Boost_USE_STATIC_LIBS}\")"
" return()"
" endif()"
"else()"
" if(BUILD_SHARED_LIBS)"
" _BOOST_SKIPPED(\"$(fname)\" \"static, BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}, set Boost_USE_STATIC_LIBS=ON to override\")"
" return()"
" endif()"
"endif()"
""
: true ;
@@ -196,14 +198,16 @@ rule generate-cmake-variant- ( target : sources * : properties * )
{
print.text
"if(NOT \"${Boost_USE_STATIC_LIBS}\" STREQUAL \"\" AND Boost_USE_STATIC_LIBS)"
" _BOOST_SKIPPED(\"$(fname)\" \"shared, Boost_USE_STATIC_LIBS=${Boost_USE_STATIC_LIBS}\")"
" return()"
"endif()"
""
"if(NOT BUILD_SHARED_LIBS)"
" _BOOST_SKIPPED(\"$(fname)\" \"shared, BUILD_SHARED_LIBS not ON, set Boost_USE_STATIC_LIBS=OFF to override\")"
" return()"
"if(DEFINED Boost_USE_STATIC_LIBS)"
" if(Boost_USE_STATIC_LIBS)"
" _BOOST_SKIPPED(\"$(fname)\" \"shared, Boost_USE_STATIC_LIBS=${Boost_USE_STATIC_LIBS}\")"
" return()"
" endif()"
"else()"
" if(NOT BUILD_SHARED_LIBS)"
" _BOOST_SKIPPED(\"$(fname)\" \"shared, BUILD_SHARED_LIBS not ON, set Boost_USE_STATIC_LIBS=OFF to override\")"
" return()"
" endif()"
"endif()"
""
: true ;