Changeset 48833d3 in tol

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

Files:

• building/Linux/build.sh (modified) (1 diff)
• tolbase/ThirdParty/CMakeLists.txt (modified) (4 diffs)
• toltcl/ThirdParty/CMakeLists.txt (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

tolbase/ThirdParty/CMakeLists.txt

@@ -4 +4 @@
 get_filename_component( TK_LIB_DIR ${TK_LIBRARY} DIRECTORY )
 
+if( NOT TCLODBC_VERSION )
+  set( TCLODBC_VERSION 2.5 )
+endif( )
+
 if( BUILD_TCLODBC )
+  message( STATUS "Third party tclodbc${TCLODBC_VERSION} will be built." )
   find_library( ODBC_LIBRARY 
     NAMES iodbc unixodbc odbc
@@ -18 +23 @@
 
   ExternalProject_Add( tclodbc
-    URL ${CMAKE_CURRENT_SOURCE_DIR}/tclodbc2.5_bayes.tar.gz
+    URL ${CMAKE_CURRENT_SOURCE_DIR}/tclodbc${TCLODBC_VERSION}_bayes.tar.gz
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}
     CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/src/tclodbc/configure 
@@ -26 +31 @@
     --with-odbclibrary=${ODBC_LIB_DIR}
     )
+  install( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib/tclodbc${TCLODBC_VERSION} COMPONENT RUNTIME DESTINATION lib )    
 endif( BUILD_TCLODBC )
 
+if( NOT TKTABLE_VERSION )
+  set( TKTABLE_VERSION 2.10 )
+endif( )
+
 if( BUILD_TKTABLE )
+  message( STATUS "Third party Tktable${TKTABLE_VERSION} will be built." )
   ExternalProject_Add( tktable
-    URL ${CMAKE_CURRENT_SOURCE_DIR}/Tktable2.10.tar.gz
+    URL ${CMAKE_CURRENT_SOURCE_DIR}/Tktable${TKTABLE_VERSION}.tar.gz
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}
     CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/src/tktable/configure
@@ -38 +49 @@
     --with-tk=${TK_LIB_DIR}
     )
+  install( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib/Tktable${TKTABLE_VERSION} COMPONENT RUNTIME DESTINATION lib )
 endif( BUILD_TKTABLE )
-
-if( BUILD_TCLODBC OR BUILD_TKTABLE )
-  file( GLOB lib_children
-    ${CMAKE_CURRENT_BINARY_DIR}/lib/* )
-  
-  #message( STATUS "lib_children = ${lib_children}" )
-  
-  install( DIRECTORY ${lib_children} COMPONENT RUNTIME DESTINATION lib )
-endif( BUILD_TCLODBC OR BUILD_TKTABLE )

toltcl/ThirdParty/CMakeLists.txt

@@ -9 +9 @@
 
 if( BUILD_TCLCURL )
+  message( STATUS "Third party TclCurl${TCLCURL_VERSION} will be built." )
   set( tclcurl_tgz "TclCurl-${TCLCURL_VERSION}.tar.gz" )
   ExternalProject_Add( tclcurl