From: <su...@us...> - 2008-08-15 14:07:43
|
Revision: 2941 http://tora.svn.sourceforge.net/tora/?rev=2941&view=rev Author: subik Date: 2008-08-15 14:07:49 +0000 (Fri, 15 Aug 2008) Log Message: ----------- continue build when there is no pgsql env Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-08-15 14:03:44 UTC (rev 2940) +++ trunk/tora/src/CMakeLists.txt 2008-08-15 14:07:49 UTC (rev 2941) @@ -390,8 +390,12 @@ ${ORACLE_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/loki/include ${CMAKE_CURRENT_SOURCE_DIR}/otl - ${POSTGRESQL_INCLUDE_DIR} ) + +IF (POSTGRESQL_INCLUDE_DIR) + INCLUDE_DIRECTORIES( ${POSTGRESQL_INCLUDE_DIR} ) +ENDIF (POSTGRESQL_INCLUDE_DIR) + IF (WANT_INTERNAL_QSCINTILLA) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/qscintilla2/Qt4 @@ -428,9 +432,12 @@ ${ORACLE_LIBRARIES} ${LIBXML2_LIBRARIES} ${QSCINTILLA_LIBRARIES} - ${POSTGRESQL_LIBRARIES} ) +IF (POSTGRESQL_LIBRARIES) + TARGET_LINK_LIBRARIES (${POSTGRESQL_LIBRARIES}) +ENDIF (POSTGRESQL_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: <mrj...@us...> - 2008-08-17 23:01:42
|
Revision: 2953 http://tora.svn.sourceforge.net/tora/?rev=2953&view=rev Author: mrjohnson0 Date: 2008-08-17 23:01:52 +0000 (Sun, 17 Aug 2008) Log Message: ----------- moc backgroundlabel Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-08-17 22:03:23 UTC (rev 2952) +++ trunk/tora/src/CMakeLists.txt 2008-08-17 23:01:52 UTC (rev 2953) @@ -79,6 +79,7 @@ tobackup.h # tobackuptool.h tobarchart.h + tobackgroundlabel.h tobrowserconstraint.h tobrowser.h tobrowserindex.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-09-24 09:40:31
|
Revision: 3036 http://tora.svn.sourceforge.net/tora/?rev=3036&view=rev Author: subik Date: 2008-09-24 09:40:23 +0000 (Wed, 24 Sep 2008) Log Message: ----------- tweaking cmake for ms visual studio debugger Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-09-22 00:54:27 UTC (rev 3035) +++ trunk/tora/src/CMakeLists.txt 2008-09-24 09:40:23 UTC (rev 3036) @@ -421,7 +421,11 @@ # 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}") + IF (WANT_DEBUG) + SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrtd.lib ${CMAKE_EXE_LINKER_FLAGS}") + ELSE (WANT_DEBUG) + SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}") + ENDIF (WANT_DEBUG) ENDIF (MSVC) ENDIF(WIN32) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2009-04-10 06:34:53
|
Revision: 3172 http://tora.svn.sourceforge.net/tora/?rev=3172&view=rev Author: subik Date: 2009-04-10 06:34:50 +0000 (Fri, 10 Apr 2009) Log Message: ----------- win&mingw: include app icon too Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2009-04-09 17:30:35 UTC (rev 3171) +++ trunk/tora/src/CMakeLists.txt 2009-04-10 06:34:50 UTC (rev 3172) @@ -416,8 +416,17 @@ IF (WIN32 AND MSVC) SET (TORA_SOURCES ${TORA_SOURCES} tora.rc) ENDIF (WIN32 AND MSVC) +if (WIN32 AND MINGW) + # resource compilation for mingw + ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tora_rc.o + COMMAND windres.exe -I${CMAKE_CURRENT_SOURCE_DIR} + -i${CMAKE_CURRENT_SOURCE_DIR}/tora.rc + -o ${CMAKE_CURRENT_BINARY_DIR}/tora_rc.o) + SET(TORA_SOURCES ${TORA_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/tora_rc.o) +endif (WIN32 AND MINGW) + 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}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2009-07-18 10:16:43
|
Revision: 3218 http://tora.svn.sourceforge.net/tora/?rev=3218&view=rev Author: subik Date: 2009-07-18 10:16:41 +0000 (Sat, 18 Jul 2009) Log Message: ----------- correctly install and use macosx icon Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2009-07-17 16:49:23 UTC (rev 3217) +++ trunk/tora/src/CMakeLists.txt 2009-07-18 10:16:41 UTC (rev 3218) @@ -496,7 +496,8 @@ IF (APPLE AND WANT_BUNDLE) SET(GUI_TYPE MACOSX_BUNDLE) - SET(MACOSX_BUNDLE_ICON_FILE ${CMAKE_SOURCE_DIR}/src/icons/tora.icns) + SET(MACOSX_BUNDLE_ICON_FILE tora.icns) + SET(APPLE_BUNDLE_SOURCES icons/tora.icns) SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/src/icons/tora.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) ENDIF (APPLE AND WANT_BUNDLE) @@ -507,6 +508,7 @@ ${TORA_SOURCES} ${TORA_UI_SOURCES} ${TORA_RCC_SRCS} + ${APPLE_BUNDLE_SOURCES} ) #Set up libraries to link with all found packages This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2009-09-29 15:28:59
|
Revision: 3324 http://tora.svn.sourceforge.net/tora/?rev=3324&view=rev Author: subik Date: 2009-09-29 15:28:50 +0000 (Tue, 29 Sep 2009) Log Message: ----------- fixes for mac Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2009-09-28 22:02:27 UTC (rev 3323) +++ trunk/tora/src/CMakeLists.txt 2009-09-29 15:28:50 UTC (rev 3324) @@ -479,7 +479,12 @@ # Handle win/mac special stuff - it's left empty for linux/unix SET (GUI_TYPE) +IF (APPLE AND WANT_BUNDLE) + SET(GUI_TYPE MACOSX_BUNDLE) + SET(APPLE_BUNDLE_SOURCES icons/tora.icns) +ENDIF (APPLE AND WANT_BUNDLE) + IF(WIN32) IF (MSVC) # this is a must to switch off subsystem:console (console window poping up) @@ -494,14 +499,7 @@ ENDIF (MSVC) ENDIF(WIN32) -IF (APPLE AND WANT_BUNDLE) - SET(GUI_TYPE MACOSX_BUNDLE) - SET(MACOSX_BUNDLE_ICON_FILE tora.icns) - SET(APPLE_BUNDLE_SOURCES icons/tora.icns) - SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/src/icons/tora.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) -ENDIF (APPLE AND WANT_BUNDLE) - ADD_EXECUTABLE(${EXE_NAME} ${GUI_TYPE} ${TORA_I18N_QM} ${TORA_MOC_SOURCES} @@ -545,12 +543,24 @@ IF (NOT WANT_BUNDLE) INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib) ELSE (NOT WANT_BUNDLE) + + #SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/osx_tools/Info.plist.in") + SET(MACOSX_BUNDLE_ICON_FILE tora.icns) + SET(MACOSX_BUNDLE_INFO_STRING "${EXE_NAME} ${VERSION}") + SET(MACOSX_BUNDLE_GUI_IDENTIFIER "com.torasql") + SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION}") + SET(MACOSX_BUNDLE_BUNDLE_NAME "${EXE_NAME}") + SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION}") + SET(MACOSX_BUNDLE_BUNDLE_VERSION "${VERSION}") + SET(MACOSX_BUNDLE_COPYRIGHT "(c) TOra developers") + SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/src/icons/tora.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + # Warning: This is dangerous to touch. Except you know what are you doing. # I ususaly don't know anything about it. But it's working ;) INSTALL(TARGETS ${EXE_NAME} BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX}) - IF (NOT WANT_BUNDLE_STANDALONE) + IF (WANT_BUNDLE_STANDALONE) # --- If we are on OS X copy all the embedded libraries to the app bundle # -------- Function to build OS X Stand Alone Bundles ----------------- function(MakeOSXBundleApp target binary_dir) @@ -622,7 +632,7 @@ \"${QT_LIBRARY_DIR}/QtGui.framework/Resources/qt_menu.nib\" \"${CMAKE_INSTALL_PREFIX}/${EXE_NAME}.app/Contents/Resources/qt_menu.nib\")") endif() - ENDIF (NOT WANT_BUNDLE_STANDALONE) + ENDIF (WANT_BUNDLE_STANDALONE) ENDIF (NOT WANT_BUNDLE) ENDIF (WIN32) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2009-10-09 20:09:52
|
Revision: 3334 http://tora.svn.sourceforge.net/tora/?rev=3334&view=rev Author: subik Date: 2009-10-09 20:09:38 +0000 (Fri, 09 Oct 2009) Log Message: ----------- fixes for oracle lib/inc if it's not defined Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2009-10-09 08:25:04 UTC (rev 3333) +++ trunk/tora/src/CMakeLists.txt 2009-10-09 20:09:38 UTC (rev 3334) @@ -458,11 +458,14 @@ ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${QT_INCLUDES} - ${ORACLE_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/loki/include ${CMAKE_CURRENT_SOURCE_DIR}/otl ) +IF (ORACLE_INCLUDES) + INCLUDE_DIRECTORIES( ${ORACLE_INCLUDES} ) +ENDIF (ORACLE_INCLUDES) + IF (POSTGRESQL_INCLUDE_DIR) INCLUDE_DIRECTORIES( ${POSTGRESQL_INCLUDE_DIR} ) ENDIF (POSTGRESQL_INCLUDE_DIR) @@ -491,11 +494,11 @@ # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be modified LINK_LIBRARIES(${QT_QTMAIN_LIBRARY}) SET (GUI_TYPE WIN32) - IF (WANT_DEBUG) - SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrtd.lib ${CMAKE_EXE_LINKER_FLAGS}") - ELSE (WANT_DEBUG) + IF (WANT_DEBUG) + SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrtd.lib ${CMAKE_EXE_LINKER_FLAGS}") + ELSE (WANT_DEBUG) SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}") - ENDIF (WANT_DEBUG) + ENDIF (WANT_DEBUG) ENDIF (MSVC) ENDIF(WIN32) @@ -513,11 +516,14 @@ # dynamic TARGET_LINK_LIBRARIES(${EXE_NAME} ${QT_LIBRARIES} - ${ORACLE_LIBRARIES} ${LIBXML2_LIBRARIES} ${QSCINTILLA_LIBRARIES} ) +IF (ORACLE_LIBRARIES) + TARGET_LINK_LIBRARIES (${EXE_NAME} ${ORACLE_LIBRARIES} ) +ENDIF (ORACLE_LIBRARIES) + IF (POSTGRESQL_LIBRARIES) TARGET_LINK_LIBRARIES (${EXE_NAME} ${POSTGRESQL_LIBRARIES}) ENDIF (POSTGRESQL_LIBRARIES) @@ -637,4 +643,3 @@ ENDIF (NOT WANT_BUNDLE) ENDIF (WIN32) - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <man...@us...> - 2010-04-13 07:20:27
|
Revision: 3503 http://tora.svn.sourceforge.net/tora/?rev=3503&view=rev Author: mantas123 Date: 2010-04-13 07:20:20 +0000 (Tue, 13 Apr 2010) Log Message: ----------- fixed to compile for windows Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2010-04-12 07:50:24 UTC (rev 3502) +++ trunk/tora/src/CMakeLists.txt 2010-04-13 07:20:20 UTC (rev 3503) @@ -524,11 +524,11 @@ # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be modified LINK_LIBRARIES(${QT_QTMAIN_LIBRARY}) SET (GUI_TYPE WIN32) - IF (WANT_DEBUG) - SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrtd.lib ${CMAKE_EXE_LINKER_FLAGS}") - ELSE (WANT_DEBUG) - SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}") - ENDIF (WANT_DEBUG) +# IF (WANT_DEBUG) +# SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrtd.lib ${CMAKE_EXE_LINKER_FLAGS}") +# ELSE (WANT_DEBUG) +# SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}") +# ENDIF (WANT_DEBUG) ENDIF (MSVC) ENDIF(WIN32) @@ -580,6 +580,7 @@ # prevent opening the cmd.exe window IF (WIN32) TARGET_LINK_LIBRARIES(${EXE_NAME} ${WINDOWS_LIB}) + TARGET_LINK_LIBRARIES(${EXE_NAME} "ws2_32.lib") # don't use console subsystem IF (MINGW) TARGET_LINK_LIBRARIES(${EXE_NAME} "-mwindows") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-04-17 16:08:37
|
Revision: 4263 http://tora.svn.sourceforge.net/tora/?rev=4263&view=rev Author: ibre5041 Date: 2012-04-17 16:08:26 +0000 (Tue, 17 Apr 2012) Log Message: ----------- experimental build fix Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2012-04-08 18:37:30 UTC (rev 4262) +++ trunk/tora/src/CMakeLists.txt 2012-04-17 16:08:26 UTC (rev 4263) @@ -567,6 +567,9 @@ "${CMAKE_CURRENT_SOURCE_DIR}/libantlr3c-3.3/include" "${CMAKE_CURRENT_BINARY_DIR}/libantlr3c-3.3" ) + IF(graphviz_FOUND) + INCLUDE_DIRECTORIES(${graphviz_INCLUDE_DIRECTORIES}) + ENDIF(graphviz_FOUND) ENDIF (USE_EXPERIMENTAL) # Handle win/mac special stuff - it's left empty for linux/unix This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2013-11-01 11:20:18
|
Revision: 4919 http://sourceforge.net/p/tora/code/4919 Author: ibre5041 Date: 2013-11-01 11:20:14 +0000 (Fri, 01 Nov 2013) Log Message: ----------- Fix: build when postgresql libs are not found Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2013-10-30 13:37:19 UTC (rev 4918) +++ trunk/tora/src/CMakeLists.txt 2013-11-01 11:20:14 UTC (rev 4919) @@ -715,7 +715,6 @@ ${QT_LIBRARIES} # dynamic ${QSCINTILLA_LIBRARIES} # dynamic ${TORA_LOKI_LIB} # static - ${POSTGRESQL_LIBRARIES} ) IF (POPPLER_QT4_FOUND) @@ -747,6 +746,10 @@ LIST(APPEND TORA_LIBS ${CMAKE_DL_LIBS}) ENDIF (WIN32) +IF (POSTGRESQL_FOUND) + LIST(APPEND ${POSTGRESQL_LIBRARIES}) +ENDIF (POSTGRESQL_FOUND) + SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) SET(CMAKE_INSTALL_RPATH "$ORIGIN/:$$ORIGIN/") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2013-11-01 13:00:20
|
Revision: 4920 http://sourceforge.net/p/tora/code/4920 Author: subik Date: 2013-11-01 13:00:14 +0000 (Fri, 01 Nov 2013) Log Message: ----------- hopefully the latest fix for pgsql libs linking Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2013-11-01 11:20:14 UTC (rev 4919) +++ trunk/tora/src/CMakeLists.txt 2013-11-01 13:00:14 UTC (rev 4920) @@ -747,7 +747,7 @@ ENDIF (WIN32) IF (POSTGRESQL_FOUND) - LIST(APPEND ${POSTGRESQL_LIBRARIES}) + LIST(APPEND TORA_LIBS ${POSTGRESQL_LIBRARIES}) ENDIF (POSTGRESQL_FOUND) SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2013-12-20 18:47:41
|
Revision: 4999 http://sourceforge.net/p/tora/code/4999 Author: ibre5041 Date: 2013-12-20 18:47:38 +0000 (Fri, 20 Dec 2013) Log Message: ----------- Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2013-12-20 11:40:12 UTC (rev 4998) +++ trunk/tora/src/CMakeLists.txt 2013-12-20 18:47:38 UTC (rev 4999) @@ -793,14 +793,19 @@ core/toqvalue.cpp core/toglobalevent.cpp editor/tostyle.cpp + editor/tohighlightedtext.cpp + editor/tomarkedtext.cpp + editor/tocomplpopup.cpp parsing/tosyntaxanalyzer.cpp parsing/tosyntaxanalyzeroracle.cpp parsing/tosyntaxanalyzernl.cpp + parsing/tolexeroracle.cpp core/utils.cpp core/utils_part.cpp core/totimer.cpp core/tomainwindow.cpp core/tocache.cpp + core/topushbutton.cpp core/tosql.cpp core/toquery.cpp #disabled parsing/tsqlparse.cpp @@ -816,12 +821,17 @@ core/moc_tomainwindow.cxx core/moc_toglobalevent.cxx core/moc_tocache.cxx + core/moc_topushbutton.cxx core/moc_toquery.cxx core/moc_totimer.cxx + editor/moc_tocomplpopup.cxx editor/moc_tostyle.cxx + editor/moc_tohighlightedtext.cxx + editor/moc_tomarkedtext.cxx parsing/moc_tsqllexer.cxx parsing/moc_tosyntaxanalyzer.cxx - ts_log/moc_toostream.cxx + parsing/moc_tolexeroracle.cxx + ts_log/moc_toostream.cxx ) ADD_EXECUTABLE("test1" ${GUI_TYPE} tests/test1.cpp @@ -888,7 +898,8 @@ parsing/tosyntaxanalyzer.cpp parsing/tosyntaxanalyzernl.cpp parsing/tosyntaxanalyzermysql.cpp - parsing/tosyntaxanalyzeroracle.cpp + parsing/tosyntaxanalyzeroracle.cpp + editor/tostyle.cpp ) SET(TEST4_MOC_SOURCES tests/moc_test4window.cxx @@ -906,6 +917,7 @@ editor/moc_tohighlightedtext.cxx editor/moc_tomarkedtext.cxx editor/moc_tocomplpopup.cxx + editor/moc_tostyle.cxx ) ADD_EXECUTABLE("test4" ${GUI_TYPE} @@ -1001,6 +1013,7 @@ editor/tomarkededitor.cpp editor/tomarkedtext.cpp editor/tosearchreplace.cpp + editor/tostyle.cpp parsing/tolexeroracle.cpp parsing/tosyntaxanalyzer.cpp parsing/tosyntaxanalyzernl.cpp @@ -1009,6 +1022,8 @@ #tools/toworksheet.cpp tools/toplsqleditor.cpp tools/toplsqltext.cpp + result/toresulttabledata.cpp + core/toresultmodeledit.cpp ) SET(TEST5_MOC_SOURCES tests/moc_test5window.cxx @@ -1054,10 +1069,11 @@ core/moc_totreewidget.cxx core/moc_toresultschema.cxx core/moc_utils.cxx + core/moc_toqueryimpl.cxx connection/moc_tooraclesetting.cxx parsing/moc_tolexeroracle.cxx parsing/moc_tsqllexer.cxx - parsing/moc_tosyntaxanalyzer.cxx + parsing/moc_tosyntaxanalyzer.cxx ts_log/moc_toostream.cxx #tools/moc_toworksheet.cxx editor/moc_tobaseeditor.cxx @@ -1070,8 +1086,11 @@ editor/moc_tomarkededitor.cxx editor/moc_tomarkedtext.cxx editor/moc_tosearchreplace.cxx + editor/moc_tostyle.cxx tools/moc_toplsqleditor.cxx tools/moc_toplsqltext.cxx + result/moc_toresulttabledata.cxx + core/moc_toresultmodeledit.cxx ) ADD_EXECUTABLE("test5" ${GUI_TYPE} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2014-01-23 09:40:08
|
Revision: 5027 http://sourceforge.net/p/tora/code/5027 Author: subik Date: 2014-01-23 09:39:59 +0000 (Thu, 23 Jan 2014) Log Message: ----------- cmake: syntax error fix Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2014-01-20 23:54:28 UTC (rev 5026) +++ trunk/tora/src/CMakeLists.txt 2014-01-23 09:39:59 UTC (rev 5027) @@ -844,7 +844,7 @@ ADD_DEPENDENCIES("test1" revisiontag) # explicitly say that the executable depends on the svnheader IF(PCH_DEFINED) ADD_PRECOMPILED_HEADER("test1" ${PCH_HEADER} FORCEINCLUDE) -ENDIF() +ENDIF(PCH_DEFINED) # test2 ADD_EXECUTABLE("test2" ${GUI_TYPE} @@ -861,7 +861,7 @@ ADD_DEPENDENCIES("test2" revisiontag) # explicitly say that the executable depends on the svnheader IF(PCH_DEFINED) ADD_PRECOMPILED_HEADER("test2" ${PCH_HEADER} FORCEINCLUDE) -ENDIF() +ENDIF(PCH_DEFINED) # test3 ADD_EXECUTABLE("test3" ${GUI_TYPE} @@ -878,7 +878,7 @@ ADD_DEPENDENCIES("test3" revisiontag) # explicitly say that the executable depends on the svnheader IF(PCH_DEFINED) ADD_PRECOMPILED_HEADER("test3" ${PCH_HEADER} FORCEINCLUDE) -ENDIF() +ENDIF(PCH_DEFINED) # test4 SET(TEST4_SOURCES @@ -942,7 +942,7 @@ ADD_DEPENDENCIES("test4" revisiontag) # explicitly say that the executable depends on the svnheader IF(PCH_DEFINED) ADD_PRECOMPILED_HEADER("test4" ${PCH_HEADER} FORCEINCLUDE) -ENDIF() +ENDIF(PCH_DEFINED) # test5 SET(TEST5_SOURCES @@ -1111,9 +1111,9 @@ ADD_DEPENDENCIES("test5" revisiontag) # explicitly say that the executable depends on the svnheader IF(PCH_DEFINED) ADD_PRECOMPILED_HEADER("test5" ${PCH_HEADER} FORCEINCLUDE) -ENDIF() +ENDIF(PCH_DEFINED) -ENDIF(TORA_DEBUG) +ENDIF(TORA_DEBUG AND TORA_TESTS) ################################################################################ # Connection provider libraries # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-07-27 12:07:00
|
Revision: 5135 http://sourceforge.net/p/tora/code/5135 Author: ibre5041 Date: 2014-07-27 12:06:53 +0000 (Sun, 27 Jul 2014) Log Message: ----------- Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2014-07-27 12:02:01 UTC (rev 5134) +++ trunk/tora/src/CMakeLists.txt 2014-07-27 12:06:53 UTC (rev 5135) @@ -34,7 +34,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/precompiled ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/extlibs/trotl/src - ${CMAKE_SOURCE_DIR}/extlibs/libantlr3cpp-3.5.1/include + ${CMAKE_SOURCE_DIR}/extlibs/libantlr3cpp-3.5.2/include ${QT_INCLUDES} ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-09-27 00:31:09
|
Revision: 5140 http://sourceforge.net/p/tora/code/5140 Author: ibre5041 Date: 2014-09-27 00:30:57 +0000 (Sat, 27 Sep 2014) Log Message: ----------- Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2014-09-27 00:09:31 UTC (rev 5139) +++ trunk/tora/src/CMakeLists.txt 2014-09-27 00:30:57 UTC (rev 5140) @@ -1148,6 +1148,7 @@ # Teradata connection provider IF(TERADATA_FOUND) SET(PROVIDER_TERADATA "pteradata") + ADD_DEFINITIONS("-DNO_CLIV2_ERROR_T") ADD_LIBRARY(${PROVIDER_TERADATA} SHARED "connection/toteradataprovider.cpp" "connection/toteradatatraits.cpp") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-11-26 01:06:36
|
Revision: 5173 http://sourceforge.net/p/tora/code/5173 Author: ibre5041 Date: 2014-11-26 01:06:29 +0000 (Wed, 26 Nov 2014) Log Message: ----------- fix - depend on qt5 libs Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2014-11-26 00:12:11 UTC (rev 5172) +++ trunk/tora/src/CMakeLists.txt 2014-11-26 01:06:29 UTC (rev 5173) @@ -1150,7 +1150,7 @@ "connection/tooracletraits.cpp" "connection/tooracleconnection.cpp" "connection/tooraclequery.cpp") - TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} ${TORA_LIB} "trotl") + TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} Qt5::Core Qt5::Widgets ${TORA_LIB} "trotl") IF(DEFINED TORA_LIB) ADD_DEPENDENCIES(${PROVIDER_ORACLE} ${TORA_LIB}) ELSE() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2014-12-01 09:51:32
|
Revision: 5176 http://sourceforge.net/p/tora/code/5176 Author: ibre5041 Date: 2014-12-01 09:51:24 +0000 (Mon, 01 Dec 2014) Log Message: ----------- Fix dependency on Qt5 even when Qt4 is used Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2014-11-28 09:56:02 UTC (rev 5175) +++ trunk/tora/src/CMakeLists.txt 2014-12-01 09:51:24 UTC (rev 5176) @@ -1150,7 +1150,11 @@ "connection/tooracletraits.cpp" "connection/tooracleconnection.cpp" "connection/tooraclequery.cpp") - TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} Qt5::Core Qt5::Widgets ${TORA_LIB} "trotl") + IF(QT5_BUILD) + TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} Qt5::Core Qt5::Widgets ${TORA_LIB} "trotl") + ELSE() + TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} ${TORA_LIB} "trotl") + ENDIF() IF(DEFINED TORA_LIB) ADD_DEPENDENCIES(${PROVIDER_ORACLE} ${TORA_LIB}) ELSE() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2015-01-10 15:07:58
|
Revision: 5181 http://sourceforge.net/p/tora/code/5181 Author: ibre5041 Date: 2015-01-10 15:07:50 +0000 (Sat, 10 Jan 2015) Log Message: ----------- missing files added Modified Paths: -------------- trunk/tora/src/CMakeLists.txt Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2015-01-10 14:07:40 UTC (rev 5180) +++ trunk/tora/src/CMakeLists.txt 2015-01-10 15:07:50 UTC (rev 5181) @@ -216,6 +216,7 @@ core/toeventqueryworker.h core/toglobalevent.h core/toglobalsetting.h + core/toglobalsettingenum.h core/tohelp.h core/tohelpsetup.h core/tolinechart.h @@ -442,6 +443,7 @@ core/toextract.cpp core/toglobalevent.cpp core/toglobalsetting.cpp + core/toglobalsettingenum.cpp core/todatabasesetting.cpp core/tohelp.cpp core/tohelpsetup.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |