3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix boost with clang on Linux and fix exclude rules for bad tests

Browse Source
This commit is contained in:
tamasmeszaros 2022-02-18 14:36:00 +01:00
parent aba254c9ba
commit 9e5cfdfddf
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deps/Boost/Boost.cmake vendored
View File

@ -11,8 +11,8 @@ endif()
set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/common.jam ./tools/build/src/tools/common.jam) set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/common.jam ./tools/build/src/tools/common.jam)
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam boost-user-config.jam)
set(_boost_toolset gcc) set(_boost_toolset gcc)
configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam boost-user-config.jam)
set(_patch_command ${_patch_command} && ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/boost-user-config.jam ./tools/build/src/tools/user-config.jam) set(_patch_command ${_patch_command} && ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/boost-user-config.jam ./tools/build/src/tools/user-config.jam)
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# https://cmake.org/cmake/help/latest/variable/MSVC_VERSION.html # https://cmake.org/cmake/help/latest/variable/MSVC_VERSION.html
@ -38,7 +38,9 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
if (WIN32) if (WIN32)
set(_boost_toolset "clang-win") set(_boost_toolset "clang-win")
else() else()
set(_boost_toolset "clang") set(_boost_toolset clang)
configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam boost-user-config.jam)
set(_patch_command ${_patch_command} && ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/boost-user-config.jam ./tools/build/src/tools/user-config.jam)
endif() endif()
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel") elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
set(_boost_toolset "intel") set(_boost_toolset "intel")
@ -71,7 +73,7 @@ ProcessorCount(NPROC)
file(TO_NATIVE_PATH ${DESTDIR}/usr/local/ _prefix) file(TO_NATIVE_PATH ${DESTDIR}/usr/local/ _prefix)
set(_boost_flags "") set(_boost_flags "")
if (UNIX) if (UNIX)
set(_boost_flags "cflags=-fPIC;cxxflags=-fPIC") set(_boost_flags "cflags=-fPIC;cxxflags=-fPIC")
elseif(APPLE) elseif(APPLE)
set(_boost_flags set(_boost_flags
@ -156,4 +158,4 @@ if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
) )
# Only override boost::Polygon Voronoi implementation with Vojtech's GMP hacks on 64bit platforms. # Only override boost::Polygon Voronoi implementation with Vojtech's GMP hacks on 64bit platforms.
list(APPEND _dep_list "dep_boost_polygon") list(APPEND _dep_list "dep_boost_polygon")
endif () endif ()

2
deps/Boost/user-config.jam vendored
View File

@ -1 +1 @@
using gcc : : @CMAKE_CXX_COMPILER@ ; using @_boost_toolset@ : : @CMAKE_CXX_COMPILER@ ;