Changeset bddfe5e in tol

Timestamp:

Feb 12, 2015, 10:59:39 AM (12 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

10ddc94

Parents:

a5a0d1c

Message:

refs #1812, #1818, actualizadas reglas install para windows

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

Location:

tol

Files:

• CMakeLists.txt (modified) (4 diffs)
• dbdrivers/CMakeLists.txt (modified) (3 diffs)

tol/CMakeLists.txt

@@ -28 +28 @@
   #message( "aaaaaa FFTW_LIB ${FFTW_LIB}" )
   #-DFFTW_ROOT:PATH=c:/MinGW/msys/1.0/local -DFFTW_USE_STATIC_LIBS=1 
+  set( CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/Runtime_Base" )
 endif( )
 
 set( TRACE_COMPONENTS_FOUND 1 )
 
-message( "CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}" )
+message( "CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}" )
 
 set( CMAKE_MODULE_PATH
@@ -38 +39 @@
   ${CMAKE_MODULE_PATH} )
 include( MSysMacros )
+include( GetPrerequisites )
 
 if( MSYS )
@@ -337 +339 @@
 create_header_links( )
 
-set( write_config_h 1 )
+set( write_config_h 0 )
 if( write_config_h )
   message( STATUS "Invoking CONFIGURE_FILE" )
@@ -376 +378 @@
 add_custom_target( COPY_HEADERS ALL DEPENDS ${COPY_HEADERS_DEPENDS} )
 
-install( TARGETS tolcon DESTINATION bin )
-install( TARGETS tol DESTINATION lib )
-install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/tol" 
-  DESTINATION "include/tol"
+if( WIN32 AND TOL_EXTERNAL_DEVEL_DIR )
+  file( TO_CMAKE_PATH "${TOL_EXTERNAL_DEVEL_DIR}/Runtime_Base" rt_base_dir )
+  install( DIRECTORY "${rt_base_dir}/bin" "${rt_base_dir}/lib" "${rt_base_dir}/include"
+    COMPONENT RUNTIME DESTINATION "." ) 
+  #message( STATUS "Looking dll's at ${TOL_EXTERNAL_PREFIX}/bin" )
+  file( TO_CMAKE_PATH "${TOL_EXTERNAL_PREFIX}/bin/*.dll" dll_pattern )
+  file( GLOB RT_DLL  ${dll_pattern} )
+  #message( STATUS "Result: ${RT_DLL}" )
+  list( APPEND RT_DLL ${LAPACK_LIBRARIES} )
+  #message( STATUS ${RT_DLL} )
+  install( FILES ${RT_DLL} COMPONENT RUNTIME DESTINATION bin )
+endif( )
+
+install( TARGETS tolcon RUNTIME DESTINATION bin )
+install( TARGETS tol
+  RUNTIME DESTINATION bin ARCHIVE DESTINATION lib )
+install( DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/tol" 
+  DESTINATION "include"
   FILES_MATCHING PATTERN "*.h" )
-install( DIRECTORY stdlib DESTINATION "bin" 
+install( DIRECTORY stdlib COMPONENT RUNTIME DESTINATION "bin" 
   PATTERN "*.tol" 
   PATTERN "*.bst"
   PATTERN "*.oza" )
+  

tol/dbdrivers/CMakeLists.txt

@@ -4 +4 @@
   target_include_directories( tolodbc PRIVATE ${ODBC_INCLUDE_DIR} )
   target_link_libraries( tolodbc ${ODBC_LIBRARIES} )
-  install( TARGETS tolodbc DESTINATION lib )
+  install( TARGETS tolodbc RUNTIME DESTINATION bin )
 endif( )
 
@@ -12 +12 @@
   target_include_directories( tolmysql PRIVATE ${MYSQL_INCLUDE_DIRECTORIES} )
   target_link_libraries( tolmysql ${MYSQL_LIBRARY} )
-  install( TARGETS tolmysql DESTINATION lib )
+  install( TARGETS tolmysql RUNTIME DESTINATION bin )
 endif( )
 
@@ -20 +20 @@
   target_include_directories( tolpgsql PRIVATE ${PostgreSQL_INCLUDE_DIRS} )
   target_link_libraries( tolpgsql ${PostgreSQL_LIBRARY} )
-  install( TARGETS tolpgsql DESTINATION lib )
+  install( TARGETS tolpgsql RUNTIME DESTINATION bin )
 endif( )