Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
nheko
Commits
bdf6e2b0
Commit
bdf6e2b0
authored
5 years ago
by
Joseph Donofry
Browse files
Options
Downloads
Patches
Plain Diff
Fix boost build in FreeBSD
parent
cade911a
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
deps/cmake/Boost.cmake
+5
-0
5 additions, 0 deletions
deps/cmake/Boost.cmake
deps/cmake/BoostToolsetId.cmake
+35
-0
35 additions, 0 deletions
deps/cmake/BoostToolsetId.cmake
with
40 additions
and
0 deletions
deps/cmake/Boost.cmake
+
5
−
0
View file @
bdf6e2b0
...
...
@@ -3,6 +3,10 @@ if(WIN32)
return
()
endif
()
include
(
BoostToolsetId
)
set
(
BOOST_TOOLSET
"gcc"
)
Boost_Get_ToolsetId
(
BOOST_TOOLSET
)
ExternalProject_Add
(
Boost
...
...
@@ -16,6 +20,7 @@ ExternalProject_Add(
CONFIGURE_COMMAND
${
DEPS_BUILD_DIR
}
/boost/bootstrap.sh
--with-libraries=random,thread,system,iostreams,atomic,chrono,date_time,regex
--prefix=
${
DEPS_INSTALL_DIR
}
--with-toolset=
${
BOOST_TOOLSET
}
BUILD_COMMAND
${
DEPS_BUILD_DIR
}
/boost/b2 -d0 cxxstd=14 variant=release link=shared runtime-link=shared threading=multi --layout=system
INSTALL_COMMAND
${
DEPS_BUILD_DIR
}
/boost/b2 -d0 install
)
...
...
This diff is collapsed.
Click to expand it.
deps/cmake/BoostToolsetId.cmake
0 → 100644
+
35
−
0
View file @
bdf6e2b0
# - Translate CMake compilers to the Boost.Build toolset equivalents
# To build Boost reliably when a non-system compiler may be used, we
# need to both specify the toolset when running bootstrap.sh *and* in
# the user-config.jam file.
#
# This module provides the following functions to help translate between
# the systems:
#
# function Boost_Get_ToolsetId(<var>)
# Set var equal to Boost's name for the CXX toolchain picked
# up by CMake. Only supports GNU and Clang families at present.
# Intel support is provisional
#
# downloaded from https://github.com/drbenmorgan/BoostBuilder/blob/master/BoostToolsetId.cmake
function
(
Boost_Get_ToolsetId _var
)
set
(
BOOST_TOOLSET
)
if
(
CMAKE_CXX_COMPILER_ID MATCHES
"GNU"
)
if
(
APPLE
)
set
(
BOOST_TOOLSET
"darwin"
)
else
()
set
(
BOOST_TOOLSET
"gcc"
)
endif
()
elseif
(
CMAKE_CXX_COMPILER_ID MATCHES
".*Clang"
)
set
(
BOOST_TOOLSET
"clang"
)
elseif
(
CMAKE_CXX_COMPILER_ID MATCHES
"Intel"
)
set
(
BOOST_TOOLSET
"intel"
)
elseif
(
CMAKE_CXX_COMPILER_ID MATCHES
"MSVC"
)
set
(
BOOST_TOOLSET
"msvc"
)
endif
()
set
(
${
_var
}
${
BOOST_TOOLSET
}
PARENT_SCOPE
)
endfunction
()
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment