File tree Expand file tree Collapse file tree 1 file changed +8
-2
lines changed Expand file tree Collapse file tree 1 file changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -4,9 +4,15 @@ project(rviz_assimp_vendor)
4
4
find_package (ament_cmake REQUIRED)
5
5
find_package (ament_cmake_vendor_package REQUIRED)
6
6
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
+
7
13
# TODO: Switch to version range in find_package in CMake 3.19
8
14
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 )
10
16
set (assimp_FOUND FALSE )
11
17
endif ()
12
18
@@ -22,7 +28,7 @@ if(MSVC)
22
28
else ()
23
29
set (ASSIMP_CMAKE_FLAGS "-DCMAKE_INSTALL_LIBDIR=lib" )
24
30
25
- set (ASSIMP_CXX_FLAGS "-std=c++17 ${CMAKE_CXX_FLAGS} " )
31
+ set (ASSIMP_CXX_FLAGS "-std=c++14 ${CMAKE_CXX_FLAGS} " )
26
32
# assimp version 5.3.1 still uses K&R style function prototypes,
27
33
# which are deprecated as of gcc 13.2 (in Ubuntu 24.04).
28
34
# Suppress the warning here for now.
You can’t perform that action at this time.
0 commit comments