diff --git a/.gitignore b/.gitignore index 6a8e562ef..990ac0a25 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ /build /build-* /doc/doxygen +/cmake-build-* +.idea diff --git a/CMakeLists.txt b/CMakeLists.txt index b934ced92..8c5aea4ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -342,7 +342,11 @@ add_subdirectory(include/fcl) set(PKG_DESC "Flexible Collision Library") -set(CMAKE_CXX_STANDARD 17) +if (MSVC) + set(CMAKE_CXX_STANDARD 14) +else() + set(CMAKE_CXX_STANDARD 17) +endif() configure_file(fcl.pc.in fcl.pc @ONLY)