Menu
▾
▴
qterm-cvs
|
From: <hep...@us...> - 2008-12-12 22:51:35
|
Revision: 579
http://qterm.svn.sourceforge.net/qterm/?rev=579&view=rev
Author: hephooey
Date: 2008-12-12 22:51:30 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
Make dbus optional part1:
CMake file changes, also a cosmetic change about the option names.
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2008-12-12 22:51:21 UTC (rev 578)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2008-12-12 22:51:30 UTC (rev 579)
@@ -1,7 +1,8 @@
set(optionalLibs)
set(optionalSources)
set(win32Libs libwsock32.a)
-option(QTERM_ENABLE_SSH "Build ssh support" ON)
+option(QTERM_ENABLE_SSH "Build SSH Support" ON)
+option(QTERM_ENABLE_DBUS "Build DBus Support" ON)
option(QTERM_ENABLE_TEST "Build the tests")
if(QTERM_ENABLE_SSH)
find_package(OpenSSL)
@@ -10,7 +11,7 @@
add_definitions(-DSSH_ENABLED)
include_directories(${OPENSSL_INCLUDE_DIR})
set(optionalLibs ${optionalLibs} ${OPENSSL_LIBRARIES})
- set(optionalSources
+ set(optionalSources ${optionalSources}
ssh/auth.cpp
ssh/channel.cpp
ssh/crc32.cpp
@@ -20,6 +21,15 @@
ssh/transport.cpp)
endif(OPENSSL_FOUND)
endif(QTERM_ENABLE_SSH)
+if(QTERM_ENABLE_DBUS)
+ if(QT_QTDBUS_FOUND)
+ message(STATUS "QtDBus module found, enable DBus support")
+ add_definitions(-DDBUS_ENABLED)
+ include_directories(${QT_QTDBUS_INCLUDE_DIR})
+ set(optionalLibs ${optionalLibs} ${QT_QTDBUS_LIBRARY})
+ set(optionalSources ${optionalSources} dbus.cpp)
+ endif(QT_QTDBUS_FOUND)
+endif(QTERM_ENABLE_DBUS)
set(qterm_SRCS
ui_aboutdialog.h
ui_addrdialog.h
@@ -38,7 +48,6 @@
aboutdialog.cpp
addrdialog.cpp
articledialog.cpp
- dbus.cpp
imageviewer.cpp
keydialog.cpp
main.cpp
@@ -107,7 +116,6 @@
${QT_QTCORE_INCLUDE_DIR}
${QT_QTGUI_INCLUDE_DIR}
${QT_QTNETWORK_INCLUDE_DIR}
- ${QT_QTDBUS_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
@@ -118,7 +126,6 @@
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTNETWORK_LIBRARY}
- ${QT_QTDBUS_LIBRARY}
${optionalLibs})
if(WIN32)
target_link_libraries(qterm ${win32Libs})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hep...@us...> - 2009-01-06 18:11:17
|
Revision: 608
http://qterm.svn.sourceforge.net/qterm/?rev=608&view=rev
Author: hephooey
Date: 2009-01-06 18:11:09 +0000 (Tue, 06 Jan 2009)
Log Message:
-----------
Install the icon.
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2009-01-06 18:11:03 UTC (rev 607)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2009-01-06 18:11:09 UTC (rev 608)
@@ -164,6 +164,7 @@
install(FILES ${qterm_MISC} DESTINATION share/qterm)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qterm.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/qterm.desktop)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qterm.desktop DESTINATION share/applications)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/qterm.png DESTINATION share/icons)
add_subdirectory(pic)
add_subdirectory(cursor)
add_subdirectory(schema)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hep...@us...> - 2009-04-26 20:42:37
|
Revision: 719
http://qterm.svn.sourceforge.net/qterm/?rev=719&view=rev
Author: hephooey
Date: 2009-04-26 20:42:33 +0000 (Sun, 26 Apr 2009)
Log Message:
-----------
More window fixes
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2009-04-26 19:51:27 UTC (rev 718)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2009-04-26 20:42:33 UTC (rev 719)
@@ -131,10 +131,6 @@
credits
qterm.cfg)
if(WIN32)
- find_library(WIN32_WS2_LIBRARY NAMES ws2_32 PATHS $ENV{WINDIR}/system32)
- if(WIN32_WS2_LIBRARY)
- set(optionalLibs ${optionalLibs} ${WIN32_WS2_LIBRARY})
- endif(WIN32_WS2_LIBRARY)
if(MINGW)
# resource compilation for mingw
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qterm_rc.o
@@ -145,13 +141,14 @@
else(MINGW)
SET(qterm_SRCS ${qterm_SRCS} qterm.rc)
endif(MINGW)
+ find_library(WIN32_WS2_LIBRARY NAMES ws2_32)
+ if(WIN32_WS2_LIBRARY)
+ set(optionalLibs ${optionalLibs} ${WIN32_WS2_LIBRARY})
+ endif(WIN32_WS2_LIBRARY)
endif(WIN32)
qt4_wrap_ui(qterm_UIS_H ${qterm_UIS})
qt4_automoc(${qterm_SRCS})
add_definitions( -DHAVE_CONFIG_H )
-if(WIN32 AND MINGW)
- set(CMAKE_CXX_FLAGS -mwindows)
-endif(WIN32 AND MINGW)
include_directories(
${QT_INCLUDE_DIR}
${QT_QTCORE_INCLUDE_DIR}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <si...@us...> - 2011-10-16 18:48:17
|
Revision: 1297
http://qterm.svn.sourceforge.net/qterm/?rev=1297&view=rev
Author: sidos
Date: 2011-10-16 18:48:11 +0000 (Sun, 16 Oct 2011)
Log Message:
-----------
reformat
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2011-10-15 22:27:50 UTC (rev 1296)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2011-10-16 18:48:11 UTC (rev 1297)
@@ -272,15 +272,17 @@
if(WIN32 AND MINGW)
target_link_libraries(${PROGRAME} ${win32Libs})
endif(WIN32 AND MINGW)
-install(TARGETS ${PROGRAME} DESTINATION bin)
-if (NOT APPLE)
+if (APPLE)
+ install(TARGETS ${PROGRAME} DESTINATION bin)
+ install(CODE "
+ include(BundleUtilities)
+ fixup_bundle(\"${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/MacOS/QTerm\" \"\" \"\")
+ " COMPONENT Runtime)
+else (APPLE)
+ install(TARGETS ${PROGRAME} DESTINATION bin)
install(FILES ${qterm_MISC} DESTINATION share/qterm)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/qterm.desktop DESTINATION share/applications)
-endif()
-install(CODE "
- include(BundleUtilities)
- fixup_bundle(\"${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/MacOS/QTerm\" \"\" \"\")
- " COMPONENT Runtime)
+endif(APPLE)
add_subdirectory(scheme)
add_subdirectory(scripts)
add_subdirectory(po)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <si...@us...> - 2011-11-22 23:52:28
|
Revision: 1308
http://qterm.svn.sourceforge.net/qterm/?rev=1308&view=rev
Author: sidos
Date: 2011-11-22 23:52:22 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
qt.conf format corrected
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2011-11-18 15:29:53 UTC (rev 1307)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2011-11-22 23:52:22 UTC (rev 1308)
@@ -278,7 +278,7 @@
install(DIRECTORY ${QT_PLUGINS_DIR}/imageformats DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/PlugIns)
install(DIRECTORY ${QT_PLUGINS_DIR}/codecs DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/PlugIns)
install(CODE "
- file(WRITE \"${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/Resources/qt.conf\" \"plugins=PlugIns\")
+ file(WRITE \"${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/Resources/qt.conf\" \"[Paths]\nPlugIns=PlugIns\")
" COMPONENT Runtime)
install(CODE "
file(GLOB_RECURSE PLUGINS ${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/PlugIns/*${CMAKE_SHARED_LIBRARY_SUFFIX})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hep...@us...> - 2009-05-19 22:13:53
|
Revision: 745
http://qterm.svn.sourceforge.net/qterm/?rev=745&view=rev
Author: hephooey
Date: 2009-05-19 22:13:44 +0000 (Tue, 19 May 2009)
Log Message:
-----------
Install the script
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2009-05-19 22:13:37 UTC (rev 744)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2009-05-19 22:13:44 UTC (rev 745)
@@ -140,6 +140,7 @@
set(qterm_MISC
address.cfg
credits
+ smth.js
qterm.cfg)
if(WIN32)
if(MINGW)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hep...@us...> - 2009-06-29 15:12:56
|
Revision: 963
http://qterm.svn.sourceforge.net/qterm/?rev=963&view=rev
Author: hephooey
Date: 2009-06-29 15:12:55 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
Disable script support if the version of Qt is too old.
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2009-06-29 15:12:43 UTC (rev 962)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2009-06-29 15:12:55 UTC (rev 963)
@@ -6,6 +6,10 @@
option(QTERM_ENABLE_PHONON "Build Phonon Support" ON)
option(QTERM_ENABLE_TEST "Build the tests")
option(QTERM_ENABLE_SCRIPT_DEBUGGER "Build ScriptDebugger Support")
+if(QT_VERSION_MINOR LESS 5)
+ message(STATUS "Script support will be disabled because you have an old version of Qt, consider update to Qt 4.5 at least.")
+ set(QTERM_ENABLE_SCRIPT OFF)
+endif(QT_VERSION_MINOR LESS 5)
if(QTERM_ENABLE_SSH)
find_package(OpenSSLCrypto)
if(OPENSSL_CRYPTO_FOUND)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hep...@us...> - 2009-12-12 16:00:38
|
Revision: 1006
http://qterm.svn.sourceforge.net/qterm/?rev=1006&view=rev
Author: hephooey
Date: 2009-12-12 16:00:29 +0000 (Sat, 12 Dec 2009)
Log Message:
-----------
Fix link problem in opensolaris
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2009-12-12 16:00:08 UTC (rev 1005)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2009-12-12 16:00:29 UTC (rev 1006)
@@ -11,6 +11,23 @@
message(STATUS "Script support will be disabled because you have an old version of Qt, consider update to Qt 4.5 at least.")
set(QTERM_ENABLE_SCRIPT OFF)
endif(QT_VERSION_MINOR LESS 5)
+
+include(CheckFunctionExists)
+include(CheckLibraryExists)
+
+check_function_exists("gethostbyname" CMAKE_HAVE_GETHOSTBYNAME)
+if(NOT CMAKE_HAVE_GETHOSTBYNAME)
+ check_library_exists("nsl" "gethostbyname" "" CMAKE_LIB_NSL_HAS_GETHOSTBYNAME)
+ if(CMAKE_LIB_NSL_HAS_GETHOSTBYNAME)
+ set(optionalLibs ${optionalLibs} -lnsl)
+ else(CMAKE_LIB_NSL_HAS_GETHOSTBYNAME)
+ check_library_exists("bsd" "gethostbyname" "" CMAKE_LIB_BSD_HAS_GETHOSTBYNAME)
+ if(CMAKE_LIB_BSD_HAS_GETHOSTBYNAME)
+ set(optionalLibs ${optionalLibs} -lbsd)
+ endif(CMAKE_LIB_BSD_HAS_GETHOSTBYNAME)
+ endif(CMAKE_LIB_NSL_HAS_GETHOSTBYNAME)
+endif(NOT CMAKE_HAVE_GETHOSTBYNAME)
+
if(QTERM_ENABLE_SSH)
find_package(OpenSSLCrypto)
if(OPENSSL_CRYPTO_FOUND)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hep...@us...> - 2009-12-12 16:00:57
|
Revision: 1008
http://qterm.svn.sourceforge.net/qterm/?rev=1008&view=rev
Author: hephooey
Date: 2009-12-12 16:00:48 +0000 (Sat, 12 Dec 2009)
Log Message:
-----------
Remove the conditional check since we require Qt 4.5 or above now
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2009-12-12 16:00:41 UTC (rev 1007)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2009-12-12 16:00:48 UTC (rev 1008)
@@ -7,10 +7,6 @@
option(QTERM_OLD_PHONON "Hack for Outdated Phonon Library" OFF)
option(QTERM_ENABLE_TEST "Build the tests")
option(QTERM_ENABLE_SCRIPT_DEBUGGER "Build ScriptDebugger Support")
-if(QT_VERSION_MINOR LESS 5)
- message(STATUS "Script support will be disabled because you have an old version of Qt, consider update to Qt 4.5 at least.")
- set(QTERM_ENABLE_SCRIPT OFF)
-endif(QT_VERSION_MINOR LESS 5)
include(CheckFunctionExists)
include(CheckLibraryExists)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hep...@us...> - 2009-12-13 14:47:17
|
Revision: 1017
http://qterm.svn.sourceforge.net/qterm/?rev=1017&view=rev
Author: hephooey
Date: 2009-12-13 14:47:10 +0000 (Sun, 13 Dec 2009)
Log Message:
-----------
CMake 2.6 do not have the lastest FindQt4.cmake to find QtScriptTools
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2009-12-13 02:09:59 UTC (rev 1016)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2009-12-13 14:47:10 UTC (rev 1017)
@@ -71,7 +71,7 @@
include_directories(${QT_QTSCRIPTTOOLS_INCLUDE_DIR})
set(optionalLibs ${optionalLibs} ${QT_QTSCRIPTTOOLS_LIBRARY})
else(QT_QTSCRIPTTOOLS_FOUND)
- message(STATUS "QtScriptTools module not found, make sure your Qt is higher than 4.5")
+ message(STATUS "QtScriptTools module not found, at least CMake 2.8 is needed to support it")
endif(QT_QTSCRIPTTOOLS_FOUND)
endif(QTERM_ENABLE_SCRIPT_DEBUGGER)
endif(QT_QTSCRIPT_FOUND)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hep...@us...> - 2010-01-15 01:04:04
|
Revision: 1137
http://qterm.svn.sourceforge.net/qterm/?rev=1137&view=rev
Author: hephooey
Date: 2010-01-15 01:03:55 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
Do not compile imageconverter.cpp when DBus is disabled
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2010-01-13 17:09:50 UTC (rev 1136)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2010-01-15 01:03:55 UTC (rev 1137)
@@ -47,7 +47,9 @@
add_definitions(-DDBUS_ENABLED)
include_directories(${QT_QTDBUS_INCLUDE_DIR})
set(optionalLibs ${optionalLibs} ${QT_QTDBUS_LIBRARY})
- set(optionalSources ${optionalSources} dbus.cpp)
+ set(optionalSources ${optionalSources}
+ imageconverter.cpp
+ dbus.cpp)
find_file(KWALLET_XML org.kde.KWallet.xml ${KDE4_DBUS_INTERFACES_DIR} ${DBUS_INTERFACES_INSTALL_DIR})
if(KWALLET_XML)
message(STATUS "KWallet found, enable KWallet support")
@@ -156,7 +158,6 @@
termstring.cpp
keyboardtranslator.cpp
closedialog.cpp
- imageconverter.cpp
${optionalSources})
set(qterm_UIS
ui/aboutdialog.ui
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <si...@us...> - 2010-06-18 14:19:37
|
Revision: 1196
http://qterm.svn.sourceforge.net/qterm/?rev=1196&view=rev
Author: sidos
Date: 2010-06-18 14:19:31 +0000 (Fri, 18 Jun 2010)
Log Message:
-----------
remove qtermwndmgr from cmakelist.txt
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2010-06-18 14:16:57 UTC (rev 1195)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2010-06-18 14:19:31 UTC (rev 1196)
@@ -147,7 +147,6 @@
qtermtoolbutton.cpp
qtermwindow.cpp
qtermwindowbase.cpp
- qtermwndmgr.cpp
qtermzmodem.cpp
qtermglobal.cpp
quickdialog.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <si...@us...> - 2010-07-02 13:07:23
|
Revision: 1203
http://qterm.svn.sourceforge.net/qterm/?rev=1203&view=rev
Author: sidos
Date: 2010-07-02 13:07:17 +0000 (Fri, 02 Jul 2010)
Log Message:
-----------
help_target as one dependence
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2010-07-02 12:35:00 UTC (rev 1202)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2010-07-02 13:07:17 UTC (rev 1203)
@@ -238,7 +238,7 @@
add_subdirectory(po)
add_subdirectory(keyboard_profiles)
add_subdirectory(doc)
-add_dependencies(qterm translations_target)
+add_dependencies(qterm translations_target help_target)
if(QTERM_ENABLE_TEST)
add_subdirectory(test)
endif(QTERM_ENABLE_TEST)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hep...@us...> - 2011-03-05 19:10:17
|
Revision: 1280
http://qterm.svn.sourceforge.net/qterm/?rev=1280&view=rev
Author: hephooey
Date: 2011-03-05 19:10:11 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
Link libX11.so
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2011-03-05 15:50:54 UTC (rev 1279)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2011-03-05 19:10:11 UTC (rev 1280)
@@ -11,6 +11,12 @@
include(CheckFunctionExists)
include(CheckLibraryExists)
+if(UNIX)
+ find_package(X11)
+ set(optionalLibs ${optionalLibs} ${X11_X11_LIB})
+endif(UNIX)
+
+
check_function_exists("gethostbyname" CMAKE_HAVE_GETHOSTBYNAME)
if(NOT CMAKE_HAVE_GETHOSTBYNAME)
check_library_exists("nsl" "gethostbyname" "" CMAKE_LIB_NSL_HAS_GETHOSTBYNAME)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hep...@us...> - 2011-05-11 19:36:45
|
Revision: 1292
http://qterm.svn.sourceforge.net/qterm/?rev=1292&view=rev
Author: hephooey
Date: 2011-05-11 19:36:38 +0000 (Wed, 11 May 2011)
Log Message:
-----------
Fix the compilation in FreeBSD, patch from adaptee at gmail.com
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2011-04-04 00:37:09 UTC (rev 1291)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2011-05-11 19:36:38 UTC (rev 1292)
@@ -11,10 +11,6 @@
include(CheckFunctionExists)
include(CheckLibraryExists)
-if(UNIX)
- find_package(X11)
- set(optionalLibs ${optionalLibs} ${X11_X11_LIB})
-endif(UNIX)
check_function_exists("gethostbyname" CMAKE_HAVE_GETHOSTBYNAME)
@@ -225,7 +221,13 @@
${QT_INCLUDE_DIR}
${QT_QTCORE_INCLUDE_DIR}
${QT_QTGUI_INCLUDE_DIR}
- ${QT_QTNETWORK_INCLUDE_DIR}
+ ${QT_QTNETWORK_INCLUDE_DIR} )
+if(UNIX)
+ find_package(X11)
+ include_directories(${X11_INCLUDE_DIR})
+ set(optionalLibs ${optionalLibs} ${X11_X11_LIB})
+endif(UNIX)
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <si...@us...> - 2011-11-14 10:44:21
|
Revision: 1304
http://qterm.svn.sourceforge.net/qterm/?rev=1304&view=rev
Author: sidos
Date: 2011-11-14 10:44:15 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
exclude APPLE from X11 detection
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2011-10-27 14:31:13 UTC (rev 1303)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2011-11-14 10:44:15 UTC (rev 1304)
@@ -232,11 +232,11 @@
${QT_QTCORE_INCLUDE_DIR}
${QT_QTGUI_INCLUDE_DIR}
${QT_QTNETWORK_INCLUDE_DIR} )
-if(UNIX)
+if(UNIX AND NOT APPLE)
find_package(X11)
include_directories(${X11_INCLUDE_DIR})
set(optionalLibs ${optionalLibs} ${X11_X11_LIB})
-endif(UNIX)
+endif(UNIX AND NOT APPLE)
include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <si...@us...> - 2011-11-18 13:27:30
|
Revision: 1306
http://qterm.svn.sourceforge.net/qterm/?rev=1306&view=rev
Author: sidos
Date: 2011-11-18 13:27:24 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
add qt plugins into bundle and fixup
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2011-11-14 11:37:19 UTC (rev 1305)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2011-11-18 13:27:24 UTC (rev 1306)
@@ -275,9 +275,17 @@
endif(WIN32 AND MINGW)
if (APPLE)
install(TARGETS ${PROGRAME} DESTINATION bin)
+ install(DIRECTORY ${QT_PLUGINS_DIR}/imageformats DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/PlugIns)
+ install(DIRECTORY ${QT_PLUGINS_DIR}/codecs DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/PlugIns)
install(CODE "
+ file(WRITE \"\${CMAKE_INSTALL_PREFIX}/bin/\${PROGRAME}.app/Contents/Resources/qt.conf\" \"\")
+ " COMPONENT Runtime)
+ install(CODE "
+ file(GLOB_RECURSE PLUGINS ${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/PlugIns/*${CMAKE_SHARED_LIBRARY_SUFFIX})
include(BundleUtilities)
- fixup_bundle(\"${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/MacOS/QTerm\" \"\" \"\")
+ fixup_bundle(\"${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/MacOS/QTerm\"
+ \"\${PLUGINS}\"
+ \"\")
" COMPONENT Runtime)
else (APPLE)
install(TARGETS ${PROGRAME} DESTINATION bin)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <si...@us...> - 2011-11-18 15:29:59
|
Revision: 1307
http://qterm.svn.sourceforge.net/qterm/?rev=1307&view=rev
Author: sidos
Date: 2011-11-18 15:29:53 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
qt.conf needs contents
Modified Paths:
--------------
trunk/qterm-qt4/src/CMakeLists.txt
Modified: trunk/qterm-qt4/src/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/src/CMakeLists.txt 2011-11-18 13:27:24 UTC (rev 1306)
+++ trunk/qterm-qt4/src/CMakeLists.txt 2011-11-18 15:29:53 UTC (rev 1307)
@@ -278,7 +278,7 @@
install(DIRECTORY ${QT_PLUGINS_DIR}/imageformats DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/PlugIns)
install(DIRECTORY ${QT_PLUGINS_DIR}/codecs DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/PlugIns)
install(CODE "
- file(WRITE \"\${CMAKE_INSTALL_PREFIX}/bin/\${PROGRAME}.app/Contents/Resources/qt.conf\" \"\")
+ file(WRITE \"${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/Resources/qt.conf\" \"plugins=PlugIns\")
" COMPONENT Runtime)
install(CODE "
file(GLOB_RECURSE PLUGINS ${CMAKE_INSTALL_PREFIX}/bin/${PROGRAME}.app/Contents/PlugIns/*${CMAKE_SHARED_LIBRARY_SUFFIX})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X