Changeset e383810 in tol

Timestamp:

Jan 10, 2016, 8:52:10 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

4197fb9

Parents:

0f1a83b

Message:

refs #1899, tolbase.sh ya no es necesario, las extensiones dentro de ThirdParty solo se compilan si se solicitan con -DBUILD_TKTABLE=ON o -DBUILD_TCLODBC=1

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

Location:

tolbase

Files:

• ThirdParty/CMakeLists.txt (modified) (1 diff)
• bin/CMakeLists.txt (modified) (1 diff)

tolbase/ThirdParty/CMakeLists.txt

@@ -4 +4 @@
 get_filename_component( TK_LIB_DIR ${TK_LIBRARY} DIRECTORY )
 
-find_library( ODBC_LIBRARY 
-  NAMES iodbc unixodbc odbc
-)
+if( BUILD_TCLODBC )
+  find_library( ODBC_LIBRARY 
+    NAMES iodbc unixodbc odbc
+    )
 
-if( ODBC_LIBRARY )
-  message( STATUS "ODBC_LIBRARY = ${ODBC_LIBRARY}" )
-else( ODBC_LIBRARY )
-  message( ERROR "Could not find ODBC library" )
-endif( ODBC_LIBRARY )
+  if( ODBC_LIBRARY )
+    message( STATUS "ODBC_LIBRARY = ${ODBC_LIBRARY}" )
+  else( ODBC_LIBRARY )
+    message( ERROR "Could not find ODBC library" )
+  endif( ODBC_LIBRARY )
 
-get_filename_component( ODBC_LIB_DIR ${ODBC_LIBRARY} DIRECTORY )
+  get_filename_component( ODBC_LIB_DIR ${ODBC_LIBRARY} DIRECTORY )
 
-ExternalProject_Add( tclodbc
-  URL ${CMAKE_CURRENT_SOURCE_DIR}/tclodbc2.5_bayes.tar.gz
-  PREFIX ${CMAKE_CURRENT_BINARY_DIR}
-  CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/src/tclodbc/configure 
+  ExternalProject_Add( tclodbc
+    URL ${CMAKE_CURRENT_SOURCE_DIR}/tclodbc2.5_bayes.tar.gz
+    PREFIX ${CMAKE_CURRENT_BINARY_DIR}
+    CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/src/tclodbc/configure 
     CC=g++ --prefix=${CMAKE_CURRENT_BINARY_DIR}
     --exec-prefix=${CMAKE_CURRENT_BINARY_DIR}
     --with-tcl=${TCL_LIB_DIR}
     --with-odbclibrary=${ODBC_LIB_DIR}
-)
+    )
+endif( BUILD_TCLODBC )
 
-ExternalProject_Add( tktable
-  URL ${CMAKE_CURRENT_SOURCE_DIR}/Tktable2.10.tar.gz
-  PREFIX ${CMAKE_CURRENT_BINARY_DIR}
-  CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/src/tktable/configure
+if( BUILD_TKTABLE )
+  ExternalProject_Add( tktable
+    URL ${CMAKE_CURRENT_SOURCE_DIR}/Tktable2.10.tar.gz
+    PREFIX ${CMAKE_CURRENT_BINARY_DIR}
+    CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/src/tktable/configure
     --prefix=${CMAKE_CURRENT_BINARY_DIR}
     --exec-prefix=${CMAKE_CURRENT_BINARY_DIR}
     --with-tcl=${TCL_LIB_DIR}
     --with-tk=${TK_LIB_DIR}
-)
+    )
+endif( 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 )
+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 )

tolbase/bin/CMakeLists.txt

@@ -1 @@
-file( GLOB FILES_SH  "${CMAKE_CURRENT_SOURCE_DIR}/*.sh" )
-message( STATUS "FILES_SH = ${FILES_SH}" )
-install( FILES ${FILES_SH} DESTINATION "bin"
-    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
-                GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE
-                WORLD_EXECUTE )
 install( FILES tolbase.tcl DESTINATION "bin"
-    PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ 
-                GROUP_WRITE WORLD_READ WORLD_WRITE )
+  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ 
+  GROUP_WRITE WORLD_READ WORLD_WRITE )