diff --git a/rviz_assimp_vendor/CMakeLists.txt b/rviz_assimp_vendor/CMakeLists.txt index 7073e71d9..1a5ce0c7c 100644 --- a/rviz_assimp_vendor/CMakeLists.txt +++ b/rviz_assimp_vendor/CMakeLists.txt @@ -12,7 +12,7 @@ set(ON 1) # TODO: Switch to version range in find_package in CMake 3.19 find_package(assimp QUIET) -if(NOT assimp_FOUND OR "${assimp_VERSION}" VERSION_LESS 5.4.3) +if(NOT assimp_FOUND OR "${assimp_VERSION}" VERSION_LESS 5.2.0) set(assimp_FOUND FALSE) endif() @@ -28,7 +28,7 @@ if(MSVC) else() set(ASSIMP_CMAKE_FLAGS "-DCMAKE_INSTALL_LIBDIR=lib") - set(ASSIMP_CXX_FLAGS "-std=c++17 ${CMAKE_CXX_FLAGS}") + set(ASSIMP_CXX_FLAGS "-std=c++14 ${CMAKE_CXX_FLAGS}") # assimp version 5.3.1 still uses K&R style function prototypes, # which are deprecated as of gcc 13.2 (in Ubuntu 24.04). # Suppress the warning here for now.