Skip to content

Commit 96d9c72

Browse files
author
Benedikt Mersch
authored
Update 3rdparty versions (#55)
1 parent df4cfca commit 96d9c72

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

src/mos4d/pybind/3rdparty/sophus/sophus.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@ set(SOPHUS_USE_BASIC_LOGGING ON CACHE BOOL "Don't use fmt for Sophus libraru")
2525
set(BUILD_SOPHUS_TESTS OFF CACHE BOOL "Don't build Sophus tests")
2626
set(BUILD_SOPHUS_EXAMPLES OFF CACHE BOOL "Don't build Sophus Examples")
2727

28-
# TODO: after https://github.com/strasdat/Sophus/pull/502 gets merged go back to mainstream
29-
FetchContent_Declare(sophus SYSTEM URL https://github.com/nachovizzo/Sophus/archive/refs/tags/1.22.11.tar.gz)
28+
FetchContent_Declare(sophus SYSTEM URL https://github.com/strasdat/Sophus/archive/refs/tags/1.24.6.tar.gz)
3029
FetchContent_MakeAvailable(sophus)

src/mos4d/pybind/3rdparty/tbb/tbb.cmake

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,24 @@
2020
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2121
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2222
# SOFTWARE.
23-
# option(BUILD_SHARED_LIBS ON)
2423
option(BUILD_SHARED_LIBS OFF)
2524
option(TBBMALLOC_BUILD OFF)
2625
option(TBB_EXAMPLES OFF)
2726
option(TBB_STRICT OFF)
2827
option(TBB_TEST OFF)
2928

3029
include(FetchContent)
31-
FetchContent_Declare(tbb SYSTEM URL https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.8.0.tar.gz)
30+
FetchContent_Declare(tbb URL https://github.com/uxlfoundation/oneTBB/archive/refs/tags/v2022.1.0.tar.gz)
31+
FetchContent_GetProperties(tbb)
3232
if(NOT tbb_POPULATED)
3333
FetchContent_Populate(tbb)
34-
add_subdirectory(${tbb_SOURCE_DIR} ${tbb_BINARY_DIR} EXCLUDE_FROM_ALL)
35-
endif()
36-
37-
if(${CMAKE_VERSION} VERSION_LESS 3.25)
38-
get_target_property(tbb_include_dirs tbb INTERFACE_INCLUDE_DIRECTORIES)
39-
set_target_properties(tbb PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${tbb_include_dirs}")
34+
if(${CMAKE_VERSION} GREATER_EQUAL 3.25)
35+
add_subdirectory(${tbb_SOURCE_DIR} ${tbb_BINARY_DIR} SYSTEM EXCLUDE_FROM_ALL)
36+
else()
37+
# Emulate the SYSTEM flag introduced in CMake 3.25. Withouth this flag the compiler will
38+
# consider this 3rdparty headers as source code and fail due the -Werror flag.
39+
add_subdirectory(${tbb_SOURCE_DIR} ${tbb_BINARY_DIR} EXCLUDE_FROM_ALL)
40+
get_target_property(tbb_include_dirs tbb INTERFACE_INCLUDE_DIRECTORIES)
41+
set_target_properties(tbb PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${tbb_include_dirs}")
42+
endif()
4043
endif()

0 commit comments

Comments
 (0)