From: <su...@us...> - 2008-04-06 18:06:41
|
Revision: 2678 http://tora.svn.sourceforge.net/tora/?rev=2678&view=rev Author: subik Date: 2008-04-06 11:06:37 -0700 (Sun, 06 Apr 2008) Log Message: ----------- Pavel Volkovitskiy's patch for cmake build without oracle Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-04-05 22:02:23 UTC (rev 2677) +++ trunk/tora/src/CMakeLists.txt 2008-04-06 18:06:37 UTC (rev 2678) @@ -33,7 +33,6 @@ tolinechartsetupui.ui tomessageui.ui tonewconnectionui.ui - tooraclesettingui.ui topreferencesui.ui toresultcontentfilterui.ui toresultlistformatui.ui @@ -57,7 +56,11 @@ totuningsettingui.ui toworksheetsetupui.ui ) +IF (ORACLE_FOUND) + LIST (APPEND TORA_UI_SRC tooraclesettingui.ui) +ENDIF (ORACLE_FOUND) + SET(TORA_MOC_CLASSES toabout.h toalert.h @@ -111,7 +114,6 @@ # tomysqlkeywords.h tonewconnection.h # tonoblockquery.h - tooraclesetting.h tooutput.h toparamget.h topiechart.h @@ -179,7 +181,11 @@ toworksheetwidget.h utils.h ) +IF (ORACLE_FOUND) + LIST(APPEND TORA_MOC_CLASSES tooraclesetting.h) +ENDIF (ORACLE_FOUND) + SET(TORA_SOURCES main.cpp toabout.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-04-07 07:27:39
|
Revision: 2682 http://tora.svn.sourceforge.net/tora/?rev=2682&view=rev Author: subik Date: 2008-04-07 00:27:41 -0700 (Mon, 07 Apr 2008) Log Message: ----------- promote mike's patch into cmake build Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-04-07 05:21:47 UTC (rev 2681) +++ trunk/tora/src/CMakeLists.txt 2008-04-07 07:27:41 UTC (rev 2682) @@ -86,6 +86,8 @@ toeditextensions.h # toeditwidget.h # toextract.h + toeventquery.h + toeventquerytask.h tofilesize.h toglobalsetting.h # tohelpbrowser.h @@ -210,6 +212,8 @@ toeditwidget.cpp toextract.cpp toextratranslations.cpp + toeventquery.cpp + toeventquerytask.cpp tofilesize.cpp # temporarily disabled due the lack of firebird here tofyracleconnection.cpp toglobalsetting.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-05-19 04:29:12
|
Revision: 2757 http://tora.svn.sourceforge.net/tora/?rev=2757&view=rev Author: mrjohnson0 Date: 2008-05-18 21:29:19 -0700 (Sun, 18 May 2008) Log Message: ----------- add toconnectionpool Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-05-18 22:03:08 UTC (rev 2756) +++ trunk/tora/src/CMakeLists.txt 2008-05-19 04:29:19 UTC (rev 2757) @@ -78,6 +78,7 @@ # toconf.h # toconfiguration.h toconnection.h + toconnectionpool.h tonoblockquery.h tocurrent.h todatatype.h @@ -207,6 +208,7 @@ tobrowsertable.cpp toconfiguration.cpp toconnection.cpp + toconnectionpool.cpp tocurrent.cpp todatatype.cpp todebug.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-07-04 13:12:49
|
Revision: 2879 http://tora.svn.sourceforge.net/tora/?rev=2879&view=rev Author: subik Date: 2008-07-04 06:12:50 -0700 (Fri, 04 Jul 2008) Log Message: ----------- win32: don't popup console window Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-07-04 13:10:23 UTC (rev 2878) +++ trunk/tora/src/CMakeLists.txt 2008-07-04 13:12:50 UTC (rev 2879) @@ -375,7 +375,18 @@ ENDIF (WANT_INTERNAL_QSCINTILLA) -ADD_EXECUTABLE(${EXE_NAME} +IF(WIN32) + IF (MSVC) + # this is a must to switch off subsystem:console (console window poping up) + # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be modified + LINK_LIBRARIES(${QT_QTMAIN_LIBRARY}) + SET (WIN32_SUBSYSTEM WIN32) + SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}") + ENDIF (MSVC) +ENDIF(WIN32) + + +ADD_EXECUTABLE(${EXE_NAME} ${WIN32_SUBSYSTEM} ${TORA_MOC_SOURCES} ${TORA_SOURCES} ${TORA_UI_SOURCES} @@ -390,6 +401,7 @@ ${LIBXML2_LIBRARIES} ${QSCINTILLA_LIBRARIES} ) + # static TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_LOKI_LIB}) IF (WANT_INTERNAL_QSCINTILLA) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-07-07 08:24:12
|
Revision: 2882 http://tora.svn.sourceforge.net/tora/?rev=2882&view=rev Author: subik Date: 2008-07-07 01:24:06 -0700 (Mon, 07 Jul 2008) Log Message: ----------- toad bindings qm is build automatically Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-07-04 14:24:50 UTC (rev 2881) +++ trunk/tora/src/CMakeLists.txt 2008-07-07 08:24:06 UTC (rev 2882) @@ -1,4 +1,5 @@ #Subdirectories +# ADD_SUBDIRECTORY(i18n) ADD_SUBDIRECTORY(loki) IF (WIN32) ADD_SUBDIRECTORY(windows) @@ -10,6 +11,12 @@ ADD_SUBDIRECTORY(qscintilla2) ENDIF(WANT_INTERNAL_QSCINTILLA) + +# only toad bindings are here. All others qm files will blow the binary too much +set (TORA_I18N_TS + i18n/tora_toad.ts +) + SET(TORA_RCC_FILES tora.qrc) SET(TORA_UI_SRC @@ -331,6 +338,7 @@ utils.cpp ) +QT4_ADD_TRANSLATION(TORA_I18N_QM ${TORA_I18N_TS}) QT4_WRAP_UI(TORA_UI_SOURCES ${TORA_UI_SRC} ) QT4_WRAP_CPP(TORA_MOC_SOURCES ${TORA_MOC_CLASSES}) QT4_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES}) @@ -380,13 +388,14 @@ # this is a must to switch off subsystem:console (console window poping up) # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be modified LINK_LIBRARIES(${QT_QTMAIN_LIBRARY}) - SET (WIN32_SUBSYSTEM WIN32) - SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}") - ENDIF (MSVC) + SET (WIN32_SUBSYSTEM WIN32) + SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}") + ENDIF (MSVC) ENDIF(WIN32) ADD_EXECUTABLE(${EXE_NAME} ${WIN32_SUBSYSTEM} + ${TORA_I18N_QM} ${TORA_MOC_SOURCES} ${TORA_SOURCES} ${TORA_UI_SOURCES} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |