Changeset 3395277 in tol for toltcl/generic

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/generic

Files:

• CMakeLists.txt (modified) (2 diffs)
• toltableset.cpp (modified) (2 diffs)

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_