Commit e37deb09 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'plugin-magic'

3266a140 modelbuilder: don't install the CMB plugins
207d06c0 triangle: always set the revision
7f766c18

 kml: enable C++11 if enabled
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarRobert Maynard <robert.maynard@kitware.com>
Merge-request: !147
parents 1d0a83b3 3266a140
superbuild_add_project(kml superbuild_add_project(kml
DEPENDS_OPTIONAL cxx11
CMAKE_ARGS CMAKE_ARGS
-DBUILD_SHARED_LIBS=OFF) -DBUILD_SHARED_LIBS=OFF)
...@@ -33,3 +33,6 @@ cmb_add_plugin( ...@@ -33,3 +33,6 @@ cmb_add_plugin(
set(cmb_plugins_to_install set(cmb_plugins_to_install
${cmb_plugins}) ${cmb_plugins})
list(REMOVE_ITEM cmb_plugins_to_install
CMB_Plugin
ModelBridge_Plugin)
...@@ -55,11 +55,9 @@ superbuild_set_revision(moab ...@@ -55,11 +55,9 @@ superbuild_set_revision(moab
GIT_REPOSITORY "https://bitbucket.org/mathstuf/moab.git" GIT_REPOSITORY "https://bitbucket.org/mathstuf/moab.git"
GIT_TAG origin/next) GIT_TAG origin/next)
if (USE_NONFREE_COMPONENTS) superbuild_set_revision(triangle
superbuild_set_revision(triangle
GIT_REPOSITORY "https://github.com/robertmaynard/triangle.git" GIT_REPOSITORY "https://github.com/robertmaynard/triangle.git"
GIT_TAG origin/master) GIT_TAG origin/master)
endif ()
superbuild_set_revision(pythonsix superbuild_set_revision(pythonsix
URL "https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz" URL "https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment