[Tora-cvs] SF.net SVN: tora:[4459] branches/tora3

[<su...@us...>]

Revision: 4459
          http://tora.svn.sourceforge.net/tora/?rev=4459&view=rev
Author:   subik
Date:     2012-09-10 14:08:17 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
make install for providers/libs

Modified Paths:
--------------
    branches/tora3/extlibs/trotl/src/CMakeLists.txt
    branches/tora3/src/CMakeLists.txt
    branches/tora3/src/core/main.cpp

Modified: branches/tora3/extlibs/trotl/src/CMakeLists.txt
===================================================================
--- branches/tora3/extlibs/trotl/src/CMakeLists.txt	2012-09-10 12:57:04 UTC (rev 4458)
+++ branches/tora3/extlibs/trotl/src/CMakeLists.txt	2012-09-10 14:08:17 UTC (rev 4459)
@@ -40,3 +40,6 @@
 ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
 
 SET(LIBRARY_OUTPUT_PATH   "${CMAKE_BINARY_DIR}/src/")
+
+install(TARGETS ${LIB_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX})
+

Modified: branches/tora3/src/CMakeLists.txt
===================================================================
--- branches/tora3/src/CMakeLists.txt	2012-09-10 12:57:04 UTC (rev 4458)
+++ branches/tora3/src/CMakeLists.txt	2012-09-10 14:08:17 UTC (rev 4459)
@@ -579,13 +579,6 @@
   LIST(APPEND TORA_SOURCES connection/tooraclesetting.cpp)
 ENDIF(ORACLE_FOUND)
 
-#IF (DB2_FOUND)
-# LIST (APPEND TORA_SOURCES connection/db2/todb2connection.cpp
-#                           connection/db2/db2connectionsub.cpp
-#                           connection/db2/db2provider.cpp
-#                           connection/db2/db2query.cpp)
-# #db2/qsql_db2.cpp)
-#ENDIF (DB2_FOUND)
 
 IF (USE_EXPERIMENTAL)
   # LIST(APPEND TORA_SOURCES docklets/tocodeoutline.cpp)
@@ -716,6 +709,7 @@
   # ADD_PRECOMPILED_HEADER(${EXE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h)
 ENDIF(USE_PCH)
 
+if (0)
 # test1
 ADD_EXECUTABLE("test1" ${GUI_TYPE}
   tests/test1.cpp
@@ -732,7 +726,6 @@
 ADD_DEPENDENCIES("test1" revisiontag)
 
 # test2
-if (FOOBAR)
 ADD_EXECUTABLE("test2" ${GUI_TYPE}
   tests/test2.cpp
   ${TORA_UI_SOURCES}  
@@ -746,7 +739,7 @@
 SET_TARGET_PROPERTIES("test2" PROPERTIES ENABLE_EXPORTS ON)
 # explicitly say that the executable depends on the svnheader
 ADD_DEPENDENCIES("test2" revisiontag)
-endif(FOOBAR)
+endif(0)
 
 IF(USE_PCH)
   IF(CMAKE_GENERATOR MATCHES Visual*)
@@ -756,7 +749,7 @@
 #    ADD_MSVC_PRECOMPILED_HEADERS( "stdafx.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h" "test2")
   ELSE(CMAKE_GENERATOR MATCHES Visual*)
     ADD_PRECOMPILED_HEADER(${EXE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h)
-    ADD_PRECOMPILED_HEADER("test1" ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h)
+#    ADD_PRECOMPILED_HEADER("test1" ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h)
   ENDIF(CMAKE_GENERATOR MATCHES Visual*)
 ENDIF(USE_PCH)
 
@@ -773,7 +766,7 @@
   TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} ${TORA_LIB} "trotl")
   # TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} test1 "trotl")
   ADD_DEPENDENCIES(${PROVIDER_ORACLE} ${EXE_NAME})
-  MESSAGE(STATUS "${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} ${TORA_LIB} trotl")
+  MESSAGE(STATUS "${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} ${TORA_LIB} trotl") 
 ENDIF(ORACLE_FOUND)
 
 # Teradata connection provider
@@ -786,7 +779,6 @@
   ADD_DEPENDENCIES(${PROVIDER_TERADATA} ${EXE_NAME})
 ENDIF (TERADATA_FOUND)
 
-
 IF (WIN32)
     # Windows install
     INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION .)
@@ -811,8 +803,11 @@
 
 elseif (UNIX)
     # Unix install
-    INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib)
-    INSTALL(FILES ${TORA_I18N_QM} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/tora/i18n)
+    install(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX})
+    install(FILES ${TORA_I18N_QM} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/tora/i18n)
+    install(TARGETS ${PROVIDER_ORACLE} RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX}/tora-${VERSION})
+    install(TARGETS ${PROVIDER_TERADATA} RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX}/tora-${VERSION})
+    add_definitions(-DPROVIDERS_PATH=\"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/tora-${VERSION}\")
 ENDIF()
 
 

Modified: branches/tora3/src/core/main.cpp
===================================================================
--- branches/tora3/src/core/main.cpp	2012-09-10 12:57:04 UTC (rev 4458)
+++ branches/tora3/src/core/main.cpp	2012-09-10 14:08:17 UTC (rev 4459)
@@ -144,6 +144,10 @@
 			}
 #endif
 
+#ifdef PROVIDERS_PATH
+			QCoreApplication::addLibraryPath(PROVIDERS_PATH);
+#endif
+
 		    // List of all connection provider finders
 		    std::vector<std::string> finders = ConnectionProviderFinderFactory::Instance().keys();
 		    // Resulting list of all the providers found

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.