diff --git a/cmake/DARTFindDependencies.cmake b/cmake/DARTFindDependencies.cmake index 85a7d3dae2834..a763ce18b0354 100644 --- a/cmake/DARTFindDependencies.cmake +++ b/cmake/DARTFindDependencies.cmake @@ -28,10 +28,10 @@ if(ASSIMP_FOUND) # Check for missing symbols in ASSIMP (see #451) include(CheckCXXSourceCompiles) set(CMAKE_REQUIRED_DEFINITIONS "") - if (NOT ASSIMP_VERSION VERSION_LESS 3.3.0 AND NOT MSVC) - set(CMAKE_REQUIRED_FLAGS "-std=c++11 -w") - else() + if (MSVC) set(CMAKE_REQUIRED_FLAGS "-w") + else() + set(CMAKE_REQUIRED_FLAGS "-std=c++11 -w") endif() set(CMAKE_REQUIRED_INCLUDES ${ASSIMP_INCLUDE_DIRS}) set(CMAKE_REQUIRED_LIBRARIES ${ASSIMP_LIBRARIES}) diff --git a/cmake/DARTFindassimp.cmake b/cmake/DARTFindassimp.cmake index cd533a2f81190..efceb3987c23b 100644 --- a/cmake/DARTFindassimp.cmake +++ b/cmake/DARTFindassimp.cmake @@ -6,17 +6,7 @@ # # This file is provided under the "BSD-style" License -find_package(assimp REQUIRED MODULE) - -# Manually check version because the upstream version compatibility policy -# doesn't allow different major number while DART is compatible any version -# greater than or equal to 4.1. -set(DART_ASSIMP_VERSION 4.1) -if(ASSIMP_VERSION AND ASSIMP_VERSION VERSION_LESS ${DART_ASSIMP_VERSION}) - message(SEND_ERROR "Found Assimp ${ASSIMP_VERSION}, but Assimp >= ${DART_ASSIMP_VERSION} - is required" - ) -endif() +find_package(assimp 5.2.2 REQUIRED MODULE) # Set target assimp if not set if((ASSIMP_FOUND OR assimp_FOUND) AND NOT TARGET assimp) diff --git a/docs/readthedocs/developer_guide/build.rst b/docs/readthedocs/developer_guide/build.rst index 11901ea41a34c..b8e3615057624 100644 --- a/docs/readthedocs/developer_guide/build.rst +++ b/docs/readthedocs/developer_guide/build.rst @@ -139,6 +139,8 @@ Here's a summary of the dependencies required to build DART (WIP): +============+==========+=========+==============+=======+ | CMake | Yes | Build | 3.22.1 | | +------------+----------+---------+--------------+-------+ +| Assimp | Yes | Runtime | 5.2.2 | | ++------------+----------+---------+--------------+-------+ | Eigen | Yes | Runtime | 3.4.0 | | +------------+----------+---------+--------------+-------+