From 25d6de33119ba12f60b6c11e62094ae7fbb591c9 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Thu, 17 Jan 2019 00:49:48 -0800 Subject: [PATCH 1/4] Specify mode for find_package() --- cmake/DARTFindEigen3.cmake | 6 +++--- cmake/DARTFindGLUT.cmake | 2 +- cmake/DARTFindIPOPT.cmake | 2 +- cmake/DARTFindNLOPT.cmake | 2 +- cmake/DARTFindODE.cmake | 2 +- cmake/DARTFindOpenGL.cmake | 2 +- cmake/DARTFindassimp.cmake | 6 +++--- cmake/DARTFindccd.cmake | 2 +- cmake/DARTFindfcl.cmake | 2 +- cmake/DARTFindflann.cmake | 2 +- cmake/DARTFindoctomap.cmake | 2 +- cmake/DARTFindpagmo.cmake | 2 +- cmake/DARTFindtinyxml2.cmake | 2 +- cmake/DARTFindurdfdom.cmake | 3 +-- 14 files changed, 18 insertions(+), 19 deletions(-) diff --git a/cmake/DARTFindEigen3.cmake b/cmake/DARTFindEigen3.cmake index bddca0621b00a..1dba2db3b36f8 100644 --- a/cmake/DARTFindEigen3.cmake +++ b/cmake/DARTFindEigen3.cmake @@ -9,10 +9,10 @@ # We intentionally don't specify the required Eigen3 version like # find_package(Eigen3 3.2.92) because the version file is not provided by # upstream until 3.3.1. -find_package(Eigen3 REQUIRED) +find_package(Eigen3 REQUIRED CONFIG) if(EIGEN3_VERSION_STRING VERSION_LESS 3.2.92) # 3.3~beta1 - message(FATAL_ERROR "Eigen3 ${EIGEN3_VERSION_STRING} is found but >= 3.2.92 - (3.3~beta1) is required" + message(FATAL_ERROR "Eigen3 ${EIGEN3_VERSION_STRING} is found but >= 3.2.92 " + "(3.3~beta1) is required" ) endif() diff --git a/cmake/DARTFindGLUT.cmake b/cmake/DARTFindGLUT.cmake index ee4a77590c9f1..b873049295fb4 100644 --- a/cmake/DARTFindGLUT.cmake +++ b/cmake/DARTFindGLUT.cmake @@ -6,4 +6,4 @@ # # This file is provided under the "BSD-style" License -find_package(GLUT QUIET) +find_package(GLUT QUIET CONFIG) diff --git a/cmake/DARTFindIPOPT.cmake b/cmake/DARTFindIPOPT.cmake index 74bda2eb32f7f..4e29b3ea75fb3 100644 --- a/cmake/DARTFindIPOPT.cmake +++ b/cmake/DARTFindIPOPT.cmake @@ -6,7 +6,7 @@ # # This file is provided under the "BSD-style" License -find_package(IPOPT 3.11.9 QUIET) +find_package(IPOPT 3.11.9 QUIET MODULE) if(IPOPT_FOUND AND NOT TARGET IPOPT::ipopt) add_library(IPOPT::ipopt INTERFACE IMPORTED) diff --git a/cmake/DARTFindNLOPT.cmake b/cmake/DARTFindNLOPT.cmake index af55f5aab607d..f9f39a3068211 100644 --- a/cmake/DARTFindNLOPT.cmake +++ b/cmake/DARTFindNLOPT.cmake @@ -6,7 +6,7 @@ # # This file is provided under the "BSD-style" License -find_package(NLOPT 2.4.1 QUIET) +find_package(NLOPT 2.4.1 QUIET MODULE) if(NLOPT_FOUND AND NOT TARGET NLOPT::nlopt) add_library(NLOPT::nlopt INTERFACE IMPORTED) diff --git a/cmake/DARTFindODE.cmake b/cmake/DARTFindODE.cmake index 43d97533fe193..9833f5acce855 100644 --- a/cmake/DARTFindODE.cmake +++ b/cmake/DARTFindODE.cmake @@ -6,7 +6,7 @@ # # This file is provided under the "BSD-style" License -find_package(ODE 0.13 QUIET) +find_package(ODE 0.13 QUIET MODULE) if(ODE_FOUND AND NOT TARGET ODE::ODE) add_library(ODE::ODE INTERFACE IMPORTED) diff --git a/cmake/DARTFindOpenGL.cmake b/cmake/DARTFindOpenGL.cmake index e0fd0600b943e..f9e132f6d66cd 100644 --- a/cmake/DARTFindOpenGL.cmake +++ b/cmake/DARTFindOpenGL.cmake @@ -14,7 +14,7 @@ if(POLICY CMP0072) cmake_policy(SET CMP0072 OLD) endif() -find_package(OpenGL QUIET) +find_package(OpenGL QUIET CONFIG) cmake_policy(POP) diff --git a/cmake/DARTFindassimp.cmake b/cmake/DARTFindassimp.cmake index 8449016378c1a..0717eb76fb9e6 100644 --- a/cmake/DARTFindassimp.cmake +++ b/cmake/DARTFindassimp.cmake @@ -6,14 +6,14 @@ # # This file is provided under the "BSD-style" License -find_package(assimp REQUIRED) +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 3.2. if(ASSIMP_VERSION VERSION_LESS 3.2) - message(STATUS "Found Assimp ${ASSIMP_VERSION}, but Assimp >= 3.2 is - required" + message(STATUS "Found Assimp ${ASSIMP_VERSION}, but Assimp >= 3.2 is " + "required" ) endif() diff --git a/cmake/DARTFindccd.cmake b/cmake/DARTFindccd.cmake index 07bf66ac9b5b6..4a58d5eddd800 100644 --- a/cmake/DARTFindccd.cmake +++ b/cmake/DARTFindccd.cmake @@ -6,7 +6,7 @@ # # This file is provided under the "BSD-style" License -find_package(ccd 2.0 REQUIRED) +find_package(ccd 2.0 REQUIRED MODULE) # Set target ccd if not set # Upstream provides the target since 2.1 diff --git a/cmake/DARTFindfcl.cmake b/cmake/DARTFindfcl.cmake index ec9aa9b1cba22..5ca6dad4b69da 100644 --- a/cmake/DARTFindfcl.cmake +++ b/cmake/DARTFindfcl.cmake @@ -6,7 +6,7 @@ # # This file is provided under the "BSD-style" License -find_package(fcl 0.3.2 REQUIRED) +find_package(fcl 0.3.2 REQUIRED MODULE) # Set target fcl if not set # Upstream provides the target since 0.5.0 but some package managers don't diff --git a/cmake/DARTFindflann.cmake b/cmake/DARTFindflann.cmake index 3560c1fa9f59a..90fca0132af28 100644 --- a/cmake/DARTFindflann.cmake +++ b/cmake/DARTFindflann.cmake @@ -6,7 +6,7 @@ # # This file is provided under the "BSD-style" License -find_package(flann 1.8.4 QUIET) +find_package(flann 1.8.4 QUIET MODULE) if((FLANN_FOUND OR flann_FOUND) AND NOT TARGET flann) add_library(flann INTERFACE IMPORTED) diff --git a/cmake/DARTFindoctomap.cmake b/cmake/DARTFindoctomap.cmake index b22743bd9e20d..487ff46b2d461 100644 --- a/cmake/DARTFindoctomap.cmake +++ b/cmake/DARTFindoctomap.cmake @@ -6,7 +6,7 @@ # # This file is provided under the "BSD-style" License -find_package(octomap 1.6.8 QUIET) +find_package(octomap 1.6.8 QUIET CONFIG CONFIG) if(octomap_FOUND AND NOT TARGET octomap) add_library(octomap INTERFACE IMPORTED) diff --git a/cmake/DARTFindpagmo.cmake b/cmake/DARTFindpagmo.cmake index 2f76e803d01d2..07ea43fa29a74 100644 --- a/cmake/DARTFindpagmo.cmake +++ b/cmake/DARTFindpagmo.cmake @@ -6,4 +6,4 @@ # # This file is provided under the "BSD-style" License -find_package(pagmo QUIET) +find_package(pagmo QUIET CONFIG) diff --git a/cmake/DARTFindtinyxml2.cmake b/cmake/DARTFindtinyxml2.cmake index 672c7f8b1f7b5..2dcbf2d1f0166 100644 --- a/cmake/DARTFindtinyxml2.cmake +++ b/cmake/DARTFindtinyxml2.cmake @@ -6,7 +6,7 @@ # # This file is provided under the "BSD-style" License -find_package(tinyxml2 QUIET) +find_package(tinyxml2 QUIET MODULE) if((TINYXML2_FOUND OR tinyxml2_FOUND) AND NOT TARGET tinyxml2::tinyxml2) add_library(tinyxml2::tinyxml2 INTERFACE IMPORTED) diff --git a/cmake/DARTFindurdfdom.cmake b/cmake/DARTFindurdfdom.cmake index 23ea9e8875720..458f72b3fcfe0 100644 --- a/cmake/DARTFindurdfdom.cmake +++ b/cmake/DARTFindurdfdom.cmake @@ -6,7 +6,7 @@ # # This file is provided under the "BSD-style" License -find_package(urdfdom QUIET) +find_package(urdfdom QUIET CONFIG) if(urdfdom_FOUND AND NOT TARGET urdfdom) add_library(urdfdom INTERFACE IMPORTED) @@ -15,4 +15,3 @@ if(urdfdom_FOUND AND NOT TARGET urdfdom) INTERFACE_LINK_LIBRARIES "${urdfdom_LIBRARIES}" ) endif() - From 1edf051af1f38abc44b71972694a2a228802e280 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Thu, 17 Jan 2019 00:51:33 -0800 Subject: [PATCH 2/4] Update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac466734cee2c..9f5fcfefec813 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ * Build system - * Fix #1223 for the recursive case: [#1227](https://github.com/dartsim/dart/pull/1227) + * Fixed #1223 for the recursive case: [#1227](https://github.com/dartsim/dart/pull/1227) + * Specified mode for find_package(): [#1228](https://github.com/dartsim/dart/pull/1228) ### [DART 6.7.1 (2019-01-15)](https://github.com/dartsim/dart/milestone/49?closed=1) From 16f10af33ef3642e8f3a27abe1d26b670461d06b Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Thu, 17 Jan 2019 01:36:07 -0800 Subject: [PATCH 3/4] Change mode for OpenGL and GLUT to MODULE --- cmake/DARTFindGLUT.cmake | 2 +- cmake/DARTFindOpenGL.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/DARTFindGLUT.cmake b/cmake/DARTFindGLUT.cmake index b873049295fb4..9320ca38b868a 100644 --- a/cmake/DARTFindGLUT.cmake +++ b/cmake/DARTFindGLUT.cmake @@ -6,4 +6,4 @@ # # This file is provided under the "BSD-style" License -find_package(GLUT QUIET CONFIG) +find_package(GLUT QUIET MODULE) diff --git a/cmake/DARTFindOpenGL.cmake b/cmake/DARTFindOpenGL.cmake index f9e132f6d66cd..5bc18bb39059f 100644 --- a/cmake/DARTFindOpenGL.cmake +++ b/cmake/DARTFindOpenGL.cmake @@ -14,7 +14,7 @@ if(POLICY CMP0072) cmake_policy(SET CMP0072 OLD) endif() -find_package(OpenGL QUIET CONFIG) +find_package(OpenGL QUIET MODULE) cmake_policy(POP) From bf1e3f9731f66dfea49d8f689af7483eca1cde8e Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Thu, 17 Jan 2019 03:35:45 -0800 Subject: [PATCH 4/4] Remove a duplicate --- cmake/DARTFindoctomap.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/DARTFindoctomap.cmake b/cmake/DARTFindoctomap.cmake index 487ff46b2d461..ec662c72b07fd 100644 --- a/cmake/DARTFindoctomap.cmake +++ b/cmake/DARTFindoctomap.cmake @@ -6,7 +6,7 @@ # # This file is provided under the "BSD-style" License -find_package(octomap 1.6.8 QUIET CONFIG CONFIG) +find_package(octomap 1.6.8 QUIET CONFIG) if(octomap_FOUND AND NOT TARGET octomap) add_library(octomap INTERFACE IMPORTED)