Changeset bb5f9a8 in tol

Timestamp:

Mar 28, 2017, 8:21:33 AM (10 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

b09e2f4f

Parents:

6b873c7

Message:

fixes #1950, en sistemas unix ZipArchive es compilado como ExternalProject

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

Location:

tol

Files:

• CMakeLists.txt (modified) (4 diffs)
• contrib/CMakeLists.txt (modified) (1 diff)
• contrib/ZipArchive/CMakeLists.txt (added)
• contrib/ZipArchive/ZipArchive_Bayes.tar.gz (added)

tol/CMakeLists.txt

@@ -169 +169 @@
 macro( create_header_links )
   if( WIN32 )
-    set( cmd "copy" )
+    set( _cmd "copy" )
   else( WIN32 )
-    set( cmd "create_symlink" )
+    set( _cmd "create_symlink" )
   endif( WIN32 )
   file( GLOB headers RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *.h *.hpp )
@@ -186 +186 @@
       add_custom_command ( 
         OUTPUT ${destFile}
-        COMMAND "${CMAKE_COMMAND}" "-E" ${cmd} ${srcFile} ${destFile}
+        COMMAND "${CMAKE_COMMAND}" "-E" ${_cmd} ${srcFile} ${destFile}
         DEPENDS ${srcFile}
         COMMENT "Creating header ${destFile}" )
@@ -364 +364 @@
 
 # ZIPARCHIVE configuration
-find_package( ZipArchive REQUIRED )
-if( ZIPARCHIVE_FOUND AND TRACE_COMPONENTS_FOUND )
-  message( "ZIPARCHIVE_INCLUDE_DIR = ${ZIPARCHIVE_INCLUDE_DIR}" )
-  message( "ZIPARCHIVE_LIBRARY = ${ZIPARCHIVE_LIBRARY}" )
-endif( )
+if(UNIX)
+  message(STATUS "On UNIX ZIPARCHIVE will be cmopiled as ExternalProject")
+else(UNIX)
+  find_package( ZipArchive REQUIRED )
+  if( ZIPARCHIVE_FOUND AND TRACE_COMPONENTS_FOUND )
+    message( "ZIPARCHIVE_INCLUDE_DIR = ${ZIPARCHIVE_INCLUDE_DIR}" )
+    message( "ZIPARCHIVE_LIBRARY = ${ZIPARCHIVE_LIBRARY}" )
+  endif( )
+endif(UNIX)
 
 # ZLIB configuration
@@ -412 +416 @@
     
 foreach( d 
-    bbasic bmath bparser btol dbdrivers contrib lang LoadDynLib OIS 
+    contrib bbasic bmath bparser btol dbdrivers lang LoadDynLib OIS 
     PackArchive )
-  add_subdirectory( ${d} )
+  add_subdirectory(${d})
 #  get_property(type TARGET ${d} PROPERTY TYPE)
 #  message("type(${d}) = '${type}'") 

tol/contrib/CMakeLists.txt

@@ -7 +7 @@
   add_subdirectory( cint )
 endif( )
+
+if(UNIX)
+  add_subdirectory(ZipArchive)
+endif(UNIX)