Changeset 2d454cf in tol

Timestamp:

Nov 23, 2015, 2:01:25 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

cdd8fca

Parents:

b0cbf1a

Message:

refs #1860, limpiamos algunas macros no usadas, los archivos .h deben instalarse desde el origen del archivo y no desde el directorio tol que solo contiene enlaces simbolicos a los originales

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

File:

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

tol/CMakeLists.txt

@@ -100 +100 @@
 
 set( skip_copy_headers 0 )
-macro( create_header_links__ )
-  #message( "create_header_links from ${CMAKE_CURRENT_SOURCE_DIR}" )
-  if( skip_copy_headers )
-    message( STATUS "Skipping create_header_links for ${CMAKE_CURRENT_SOURCE_DIR}" )
-  else( )
-      file( GLOB headers RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *.h *.hpp )
-      if( WIN32 )
-        set( cmd "copy_if_different" )
-      else( WIN32 )
-        set( cmd "create_symlink" )
-      endif( WIN32 )
-      foreach( h ${headers} )
-        execute_process(
-          COMMAND "${CMAKE_COMMAND}" "-E" ${cmd} 
-          "${CMAKE_CURRENT_SOURCE_DIR}/${h}"
-          "${PROJECT_BINARY_DIR}/tol/${h}"
-          RESULT_VARIABLE rc
-          OUTPUT_VARIABLE output
-          ERROR_VARIABLE error
-          )
-       endforeach( h )
-  endif( )  
-endmacro( create_header_links__ )
-
-macro( create_header_links2 )
-  if( WIN32 )
-    set( cmd "copy" )
-  else( WIN32 )
-    set( cmd "create_symlink" )
-  endif( WIN32 )
-  file( GLOB headers RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *.h *.hpp )
-  foreach( h ${headers} )
-    set( srcFile "${CMAKE_CURRENT_SOURCE_DIR}/${h}" )
-    set( destFile "${PROJECT_BINARY_DIR}/tol/${h}" )
-    if( NOT EXISTS ${destFile} OR ( ${srcFile} IS_NEWER_THAN ${destFile} ) )
-        message( STATUS "Copying from %{srcFile} to ${newFile}" )
-        execute_process(
-          COMMAND "${CMAKE_COMMAND}" "-E" ${cmd} ${srcFile} ${destFile}
-          RESULT_VARIABLE rc
-          OUTPUT_VARIABLE output
-          ERROR_VARIABLE error )
-    endif()
-  endforeach( )
-endmacro( create_header_links2 )
 
 set( COPY_HEADERS_DEPENDS "" CACHE INTERNAL "" )
@@ -152 +108 @@
     set( cmd "create_symlink" )
   endif( WIN32 )
+  file( GLOB headers RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *.h *.hpp )
+  install( FILES ${headers} DESTINATION "include/tol"
+        COMPONENT DEVELOPMENT )
   if( skip_copy_headers )
     message( STATUS "Skipping create_header_links for ${CMAKE_CURRENT_SOURCE_DIR}" )
   else( skip_copy_headers )
-    file( GLOB headers RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *.h *.hpp )
     set( lst  "" )
     foreach( h ${headers} )
@@ -423 +381 @@
 install( TARGETS tol
   RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
-install( DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/tol" 
-  DESTINATION "include"
-  COMPONENT DEVELOPMENT )
+
 install( DIRECTORY stdlib COMPONENT RUNTIME DESTINATION "bin" 
   PATTERN "*.tol"