Skip to content

Commit cc7d1c9

Browse files
authored
Revert "Update ASSIMP_VENDOR CMakeLists.txt (#1226)" (#1249)
This reverts commit 5f896af.
1 parent 642b1a3 commit cc7d1c9

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

rviz_assimp_vendor/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,15 @@ project(rviz_assimp_vendor)
44
find_package(ament_cmake REQUIRED)
55
find_package(ament_cmake_vendor_package REQUIRED)
66

7+
# Override ON so that the following CMake logic in assimp 5.0.1 and older
8+
# doesn't result in a CMake warning: if(ON)
9+
# https://github.com/ros2/rviz/issues/524
10+
# https://bugs.launchpad.net/ubuntu/+source/assimp/+bug/1869405
11+
set(ON 1)
12+
713
# TODO: Switch to version range in find_package in CMake 3.19
814
find_package(assimp QUIET)
9-
if(NOT assimp_FOUND OR "${assimp_VERSION}" VERSION_LESS 5.3.1)
15+
if(NOT assimp_FOUND OR "${assimp_VERSION}" VERSION_LESS 5.2.0)
1016
set(assimp_FOUND FALSE)
1117
endif()
1218

@@ -22,7 +28,7 @@ if(MSVC)
2228
else()
2329
set(ASSIMP_CMAKE_FLAGS "-DCMAKE_INSTALL_LIBDIR=lib")
2430

25-
set(ASSIMP_CXX_FLAGS "-std=c++17 ${CMAKE_CXX_FLAGS}")
31+
set(ASSIMP_CXX_FLAGS "-std=c++14 ${CMAKE_CXX_FLAGS}")
2632
# assimp version 5.3.1 still uses K&R style function prototypes,
2733
# which are deprecated as of gcc 13.2 (in Ubuntu 24.04).
2834
# Suppress the warning here for now.

0 commit comments

Comments
 (0)