Changeset 3395277 in tol

Timestamp:

Feb 13, 2015, 9:08:01 AM (12 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

edd4377

Parents:

b09eb20c

Message:

refs #1812, #1818, configuracion especifica para WIN32 donde concoemos bien donde estaran los archivos devel que tomamos de la variable TOL_PREFIX_PATH

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

Location:

toltcl

Files:

• CMakeLists.txt (modified) (3 diffs)
• generic/CMakeLists.txt (modified) (2 diffs)
• generic/toltableset.cpp (modified) (2 diffs)
• library/CMakeLists.txt (modified) (2 diffs)

toltcl/CMakeLists.txt

@@ -1 +1 @@
 cmake_minimum_required( VERSION 2.8 )
+project( TOLTCL )
 
 set( CMAKE_MODULE_PATH
@@ -5 +6 @@
   ${CMAKE_MODULE_PATH} )
 
+include( LibFindMacros )
+
 # The version number.
 set (TOLTCL_VERSION_MAJOR 3)
 set (TOLTCL_VERSION_MINOR 2)
-
-# look for tcl
-find_package( TclStub REQUIRED )
-if( TCL_FOUND )
-  add_definitions( -DUSE_TCL_STUBS )
-  add_definitions( -DTCL_THREADS )
-  include_directories( ${TCL_INCLUDE_PATH} )
-  message( STATUS ${TCL_LIBRARY_PATH} )
-  message( STATUS ${TCL_LIBRARY_PATH_PARENT} )
-
-  set( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH_PARENT} )
-else( TCL_FOUND )
-  message( SEND_ERROR "TCL extensions need Tcl Stubs library" )
-endif( TCL_FOUND )
 
 # look fot tol
@@ -30 +19 @@
 else( TOL_FOUND )
 endif( TOL_FOUND )
- 
+
+# look for tcl
+if ( WIN32 AND TOL_PREFIX_PATH )
+  find_library( TCL_STUB_LIBRARY
+      NAMES "libtclstub84" "libtclstub85" "libtclstub86"
+      PATHS "${TOL_PREFIX_PATH}/lib"
+      NO_DEFAULT_PATH
+    )
+  find_path(
+    TCL_INCLUDE_PATH
+    NAMES "tcl.h"
+    PATHS "${TOL_PREFIX_PATH}/include"
+    NO_DEFAULT_PATH
+    )
+  set( TCL_PROCESS_INCLUDES TCL_INCLUDE_PATH )
+  set( TCL_PROCESS_LIBS TCL_STUB_LIBRARY )
+  libfind_process( TCL )
+else( WIN32 AND TOL_PREFIX_PATH )
+  find_package( TclStub REQUIRED )
+endif( WIN32 AND TOL_PREFIX_PATH )
+
+if( TCL_FOUND )
+  message( STATUS ${TCL_STUB_LIBRARY} )
+  message( STATUS ${TCL_INCLUDE_PATH} )
+  get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_INCLUDE_PATH} PATH )
+  message( STATUS "Using CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )
+else( TCL_FOUND )
+  message( SEND_ERROR "TCL extensions need Tcl Stubs library" )
+endif( TCL_FOUND )
+  
 set( TOLTCL_DEST_DIR "lib/toltcl${TOLTCL_VERSION_MAJOR}.${TOLTCL_VERSION_MINOR}"
   CACHE INTERNAL "" )

toltcl/generic/CMakeLists.txt

@@ +1 @@
+add_definitions( -DBUILD_TOLTCL -DUSE_TCL_STUBS -DTCL_THREADS )
+include_directories( ${TCL_INCLUDE_PATH} )
+  
 add_library( toltcl SHARED
   crash.c toltcl.c pool.cpp tclutils.cpp tolaccess.cpp tolsergrp.cpp 
@@ -4 +7 @@
 )
 
-message( "aaaa = ${CMAKE_CURRENT_SOURCE_DIR}" )
+include_directories( ${TCL_INCLUDE_PATH} ${TOL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
 
-include_directories( ${TOL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
-
+message( STATUS "Using TCL_INCLUDE_PATH = ${TCL_INCLUDE_PATH}" )
+message( STATUS "Using TCL_STUB_LIBRARY = ${TCL_STUB_LIBRARY}" )
 target_link_libraries( toltcl
   ${TCL_STUB_LIBRARY} ${TOL_LIBRARY} )
 
-install( TARGETS toltcl DESTINATION "${TOLTCL_DEST_DIR}" )
+install( TARGETS toltcl RUNTIME DESTINATION "${TOLTCL_DEST_DIR}" )

toltcl/generic/toltableset.cpp

@@ -127 +127 @@
   int PrependUnknown();
   int PrependEmptyReal();
-  int PrependText( char * txt );
+  int PrependText( const char * txt );
 private:
   Tcl_DString dsName;
@@ -576 +576 @@
  */
 
-int Tol_ColumnData::PrependText( char * txt )
+int Tol_ColumnData::PrependText( const char * txt )
 {
 #ifdef _DEBUG_TABLE_

toltcl/library/CMakeLists.txt

@@ +1 @@
+if( POLICY CMP0026 )
+  cmake_policy( SET CMP0026 OLD )
+endif( POLICY CMP0026 )
+
 get_target_property( TOLTCL_LIB_LOCATION toltcl LOCATION )
 get_filename_component( TOLTCL_LIB_NAME ${TOLTCL_LIB_LOCATION} NAME )
@@ -9 +13 @@
 
 install( FILES "${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl" toltcl.tcl
-  DESTINATION "${TOLTCL_DEST_DIR}" )
+  COMPONENT RUNTIME DESTINATION "${TOLTCL_DEST_DIR}" )