Merge pull request RobotLocomotion#6115 from jamiesnape/cmake-package…

…-registry Propagate CMAKE_EXPORT_NO_PACKAGE_REGISTRY to external projects
trigrass2 · May 16, 2017 · 68fc9e4 · 68fc9e4
2 parents 248db0c + e7673a1
commit 68fc9e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -75,7 +75,6 @@ drake_add_external(fmt PUBLIC CMAKE ALWAYS
 drake_add_external(gflags PUBLIC CMAKE
   CMAKE_ARGS
     -DBUILD_SHARED_LIBS=ON
-    -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
     -DGFLAGS_BUILD_gflags_nothreads_LIB=OFF)
 
 # googletest
@@ -168,9 +167,7 @@ drake_add_external(snopt CMAKE MATLAB
 
 # octomap
 drake_add_external(octomap PUBLIC CMAKE
-  CMAKE_ARGS
-    -DBUILD_TESTING=OFF
-    -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
+  CMAKE_ARGS -DBUILD_TESTING=OFF
   SOURCE_SUBDIR octomap)
 
 # vtk
@@ -207,7 +204,6 @@ drake_add_external(tinyobjloader PUBLIC CMAKE
 drake_add_external(yaml_cpp PUBLIC CMAKE
  CMAKE_ARGS
    -DBUILD_SHARED_LIBS=ON
-   -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
    -DYAML_CPP_BUILD_CONTRIB=OFF
    -DYAML_CPP_BUILD_TOOLS=OFF)
 

diff --git a/cmake/externals.cmake b/cmake/externals.cmake
@@ -156,6 +156,7 @@ macro(drake_add_cmake_external PROJECT)
   set(_ext_LIST_SEPARATOR "!")
 
   set(_ext_PROPAGATE_CACHE_VARS
+    CMAKE_EXPORT_NO_PACKAGE_REGISTRY
     CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY
     CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY
     CMAKE_PREFIX_PATH