Changeset 48833d3 in tol for building/Linux

Timestamp:

Feb 19, 2016, 11:45:27 AM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

6755180

Parents:

232d1b9

Message:

Refs #1880, #1899
Se incorporan las opciones de compilación de las "ThirdParty" en build.sh.
Se corrige el mecanismo de inclusión de estos paquetes de tcl/Tk en la instalación. El mecanismo anterior basado en lib_children fallaba al no existir aún los directorios en tiempo de cmake.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7239 be4846ae-f051-483a-831f-b64e7d08527f

File:

• building/Linux/build.sh (modified) (1 diff)

building/Linux/build.sh

@@ -65 +65 @@
     cmake $PROJECT_DIR -DCMAKE_BUILD_TYPE=$mode -DZIPARCHIVE_ROOT_DIR=/usr/local/ZipArchive$suffix -DZIPARCHIVE_AS_STATIC=TRUE -DCMAKE_INSTALL_PREFIX=/usr/local/tol$version$suffix
   else
-    cmake $PROJECT_DIR -DCMAKE_BUILD_TYPE=$mode -DTOL_PREFIX_PATH=/usr/local/tol$version$suffix -DCMAKE_INSTALL_PREFIX=/usr/local/tol$version$suffix
+    if [ "$project" = "toltcl" ]; then
+      OPT_3PARTY="-DBUILD_TCLCURL=TRUE"
+    elif [ "$project" = "tolbase" ]; then
+      OPT_3PARTY="-DBUILD_TCLODBC=TRUE -DBUILD_TKTABLE=TRUE"
+    else 
+      OPT_3PARTY=
+    fi
+    cmake $PROJECT_DIR $OPT_3PARTY -DCMAKE_BUILD_TYPE=$mode -DTOL_PREFIX_PATH=/usr/local/tol$version$suffix -DCMAKE_INSTALL_PREFIX=/usr/local/tol$version$suffix
   fi  
 fi