Changeset 2c56a00 in tol

Timestamp:

Nov 30, 2015, 9:30:28 AM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

f5f1624

Parents:

1bcb3dd

Message:

correcciones en la descarga de los de defaultpackages para MINGW, faltaba un PARENT_SCOPE, asegurar que tol_plat se limpie

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

File:

• tol/CMakeLists.txt (modified) (3 diffs)

tol/CMakeLists.txt

@@ -101 +101 @@
     endif( )
   elseif( MINGW )
-    set( ${var} "Win${tol_ps}GNU" )
+    set( ${var} "Win${tol_ps}GNU" PARENT_SCOPE )
   else( MINGW )
     message( WARNING "Could not determine TOL platform for system ${CMAKE_SYSTEM_NAME}" )
@@ -112 +112 @@
   set( url "http://packages.tol-project.org/OfficialTolArchiveNetwork/repository.php?action=download&format=attachment&tol_package_version=4&package=${pkg}" )
   if ( WGET_FOUND )
-    if( bin )
+    if( ${bin} )
       get_tol_plat( tol_plat )
       set( url "${url}%23${tol_plat}" )
+    else( )
+      set( tol_plat "" )
     endif( )
-    message( "going to download last version of ${pkg} ..." )
+    message( STATUS "going to download last version of ${pkg} for platform '${tol_plat}' ..." )
     execute_process( 
       COMMAND ${WGET_EXECUTABLE} --content-disposition "${url}" 
@@ -442 +444 @@
       COMPONENT RUNTIME )
   endif( )
+else( WGET_FOUND )
+  message( WARNING "Could not download default packages 'StdLib' and 'TclCore' because wget command is not available. wget must be included in PATH in order to use it" )
 endif( WGET_FOUND )