Changeset 5287156 in tol

Timestamp:

Sep 15, 2015, 9:12:37 AM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

62f68e4

Parents:

b45213b

Message:

corrección de regla install para linux, las .so deben ir al directorio lib

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

Location:

tol

Files:

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

tol/CMakeLists.txt

@@ -71 +71 @@
 macro( add_tol_sublibrary name )
   add_library( ${name} OBJECT ${ARGN} )
-  message( STATUS "add_library( ${name} OBJECT ${ARGN} )" )
+  #message( STATUS "add_library( ${name} OBJECT ${ARGN} )" )
   if( CMAKE_BUILD_TYPE MATCHES Debug )
     # -fstack-protector-all -Wstack-protector -fno-omit-frame-pointer
@@ -397 +397 @@
 install( TARGETS tolcon RUNTIME DESTINATION bin )
 install( TARGETS tol
-  RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION bin )
+  RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/tol" 
   DESTINATION "include"

tol/dbdrivers/CMakeLists.txt

@@ -4 +4 @@
   target_include_directories( tolodbc0 PRIVATE ${ODBC_INCLUDE_DIR} )
   target_link_libraries( tolodbc0 ${ODBC_LIBRARIES} )
-  install( TARGETS tolodbc0 RUNTIME DESTINATION bin LIBRARY DESTINATION bin )
+  install( TARGETS tolodbc0 RUNTIME DESTINATION bin LIBRARY DESTINATION lib )
 endif( )
 
@@ -12 +12 @@
   target_include_directories( tolmysql0 PRIVATE ${MYSQL_INCLUDE_DIRECTORIES} )
   target_link_libraries( tolmysql0 ${MYSQL_LIBRARY} )
-  install( TARGETS tolmysql0 RUNTIME DESTINATION bin LIBRARY DESTINATION bin )
+  install( TARGETS tolmysql0 RUNTIME DESTINATION bin LIBRARY DESTINATION lib )
 endif( )
 
@@ -20 +20 @@
   target_include_directories( tolpgsql0 PRIVATE ${PostgreSQL_INCLUDE_DIRS} )
   target_link_libraries( tolpgsql0 ${PostgreSQL_LIBRARY} )
-  install( TARGETS tolpgsql0 RUNTIME DESTINATION bin LIBRARY DESTINATION bin )
+  install( TARGETS tolpgsql0 RUNTIME DESTINATION bin LIBRARY DESTINATION lib )
 endif( )