Changeset 4e0c941 in tol

Timestamp:

Dec 9, 2015, 10:19:46 AM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

42be8b0

Parents:

e02d24a

Message:

refs #1901, en un linux 64 bit puro las libs estan en /usr/lib, por eso hay que pasar las opciones --with-xyz a los configure

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

File:

• tolbase/ThirdParty/CMakeLists.txt (modified) (2 diffs)

tolbase/ThirdParty/CMakeLists.txt

@@ -1 +1 @@
 include(ExternalProject)
+
+get_filename_component( TCL_LIB_DIR ${TCL_LIBRARY} DIRECTORY )
+get_filename_component( TK_LIB_DIR ${TK_LIBRARY} DIRECTORY )
+
+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 )
+
+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 CC=g++ --prefix=${CMAKE_CURRENT_BINARY_DIR} --exec-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}
 )
 
@@ -10 +29 @@
   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}
+  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}
 )