Merge pull request #1907 from bilke/rm-ext-project

[CMake] Remove external projects

scripts/jenkins/msvc.groovy

 
 def defaultCMakeOptions =
-    '-DOGS_LIB_BOOST=System ' +
-    '-DOGS_LIB_VTK=System ' +
-    '-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON'
+    '-DOGS_USE_CONAN=ON ' +
+    '-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON '
 
 def guiCMakeOptions =
     '-DOGS_BUILD_GUI=ON ' +
     '-DOGS_BUILD_UTILS=ON ' +
     '-DOGS_BUILD_TESTS=OFF ' +
     '-DOGS_BUILD_SWMM=ON ' +
-    '-DOGS_BUILD_METIS=ON'
+    '-DOGS_BUILD_METIS=ON '
 
 def configure = new ogs.configure()
 def build = new ogs.build()
@@ -32,8 +31,7 @@ withEnv(helper.getEnv(this)) {
 
     stage('Data Explorer (Win)') {
         configure.win(
-            cmakeOptions: defaultCMakeOptions + ' ' + guiCMakeOptions, keepDir: true,
-            conanOptions: "-o gui=True",
+            cmakeOptions: defaultCMakeOptions + guiCMakeOptions, keepDir: true,
             script: this
         )
         build.win(script: this)

scripts/jenkins/msvc32.groovy

 def defaultCMakeOptions =
     '-DCMAKE_BUILD_TYPE=Release ' +
+    '-DOGS_USE_CONAN=ON ' +
     '-DOGS_32_BIT=ON ' +
-    '-DOGS_LIB_BOOST=System ' +
-    '-DOGS_LIB_VTK=System ' +
     '-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON ' +
     '-DOGS_BUILD_GUI=ON ' +
     '-DOGS_BUILD_UTILS=OFF ' +
     '-DOGS_BUILD_TESTS=OFF ' +
-    '-DOGS_BUILD_CLI=OFF'
+    '-DOGS_BUILD_CLI=OFF '
 
 def configure = new ogs.configure()
 def build = new ogs.build()
@@ -20,7 +19,6 @@ withEnv(helper.getEnv(this, 'x32')) {
         configure.win(
             arch: 'x86',
             cmakeOptions: defaultCMakeOptions,
-            conanOptions: "-o gui=True",
             script: this
         )
         build.win(script: this)
@@ -28,6 +26,6 @@ withEnv(helper.getEnv(this, 'x32')) {
 }
 
 stage('Post 32-bit (Win)') {
-    archiveArtifacts 'build/*.zip'
+    archiveArtifacts 'build/*.zip,build/conaninfo.txt'
     post.cleanup('build')
 }

scripts/travis/eigen.sh

+#!/bin/sh
+set -e
+# check to see if cmake folder is empty
+if [ ! -d "$HOME/eigen-eigen-dc6cfdf9bcec/Eigen" ]; then
+    ZIP="3.2.9.zip"
+    cd $HOME
+    curl -L -o $ZIP http://bitbucket.org/eigen/eigen/get/$ZIP;
+    unzip $ZIP;
+else
+    echo 'Using cached eigen directory.';
+fi