Changeset fc40744 in tol

Timestamp:

Feb 15, 2016, 12:23:09 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

021afa6

Parents:

e16e124

Message:

refs #1899, correccion a la regla install de tclcurl

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

File:

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

toltcl/ThirdParty/CMakeLists.txt

@@ -4 +4 @@
 get_filename_component( TK_LIB_DIR ${TK_LIBRARY} DIRECTORY )
 
+if( NOT TCLCURL_VERSION )
+  set( TCLCURL_VERSION 7.22.0 )
+endif( )
+
 if( BUILD_TCLCURL )
-  if( TCLCURL_VERSION )
-    set( tclcurl_tgz "TclCurl-${TCLCURL_VERSION}.tar.gz" )
-  else( TCLCURL_VERSION )
-    set( tclcurl_tgz "TclCurl-7.22.0.tar.gz" )
-  endif( TCLCURL_VERSION )
+  set( tclcurl_tgz "TclCurl-${TCLCURL_VERSION}.tar.gz" )
   ExternalProject_Add( tclcurl
     URL ${CMAKE_CURRENT_SOURCE_DIR}/${tclcurl_tgz}
@@ -19 +19 @@
     BUILD_IN_SOURCE 1
     )
+  install( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib/TclCurl${TCLCURL_VERSION} COMPONENT RUNTIME DESTINATION lib )
 endif( BUILD_TCLCURL )
 
-if( BUILD_TCLCURL )
-  file( GLOB lib_children
-    ${CMAKE_CURRENT_BINARY_DIR}/lib/* )
-  
-  #message( STATUS "lib_children = ${lib_children}" )
-  
-  install( DIRECTORY ${lib_children} COMPONENT RUNTIME DESTINATION lib )
-endif( BUILD_TCLCURL )