Changeset a716459 in tol

Timestamp:

Oct 11, 2015, 9:53:29 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

ed3716e

Parents:

671992b

Message:

refs #1866, algunos #pragma warning solo son válidos en MSVC, podemos usar tambien tcl8.6

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

Location:

tol

Files:

• CMakeLists.txt (modified) (1 diff)
• tol_bcommon.h (modified) (2 diffs)

tol/CMakeLists.txt

@@ -452 +452 @@
     file( INSTALL ${tcl-libs} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
   endif( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/lib/tkdnd" )
-  if( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/lib/tcl8.4" )
-    file( INSTALL
-          "${TOL_EXTERNAL_PREFIX}/lib/dde1.3"
-          "${TOL_EXTERNAL_PREFIX}/lib/reg1.2"
-          "${TOL_EXTERNAL_PREFIX}/lib/tcl8.4"
-          "${TOL_EXTERNAL_PREFIX}/lib/TclCurl7.22.0"
-          "${TOL_EXTERNAL_PREFIX}/lib/tk8.4"
-          DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
-  endif( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/lib/tcl8.4" )
+  
+  set( tcldirs "")
+  foreach( pdir tcl8 tk8 dde reg TclCurl )
+    file( GLOB pdirx.y RELATIVE "${TOL_EXTERNAL_PREFIX}/lib" "${TOL_EXTERNAL_PREFIX}/lib/${pdir}*" )
+        list( APPEND tcldirs ${pdirx.y} )
+  endforeach( pdir tcl8 tk8 dde reg TclCurl )
+  list( GET tcldirs 0 tcldir0)
+  if( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/lib/${tcldir0}" )
+    foreach( d ${tcldirs} )
+          file( INSTALL "${TOL_EXTERNAL_PREFIX}/lib/${d}" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
+        endforeach( d ${tcldirs} )
+  endif( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/lib/${tcldir0}" )
+  
   if( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/include/tcl.h" )
     file( GLOB tcl_h "${TOL_EXTERNAL_PREFIX}/include/tcl*.h" )

tol/tol_bcommon.h

@@ -229 +229 @@
 //Disable paranoid warning in Visual C++ 7: '<' : no coinciden signed/unsigned
 #pragma warning(disable : 4018)
-#endif
-
 //no suitable definition provided for explicit template instantiation request
 #pragma warning(disable : 4661)
@@ -237 +235 @@
 // identifier was truncated to '255' characters in the browser information
 #pragma warning(disable : 4786)
+#endif
+
 #   else
 #       define TOL_DLLIMPORT