[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebindings
From: Ian Monroe <ian.monroe () gmail ! com>
Date: 2010-11-21 15:55:05
Message-ID: 20101121155505.9CADEAC8A0 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1199320 by ianmonroe:
Split up Smoke into Qt and KDE directories.
Move libsmoke stuff into the generator directory
Split up Ruby into qtruby and korundum directories
M +0 -31 CMakeLists.txt
M +4 -0 generator/CMakeLists.txt
A generator/README smoke/README#1198770
A generator/deptool (directory)
A generator/smoke.h smoke/smoke.h#1198770 [License: BSD]
A generator/smokeapi (directory)
A generator/smokebase (directory)
M +2 -108 ruby/CMakeLists.txt
D ruby/akonadi (directory)
D ruby/kate (directory)
D ruby/kdevplatform (directory)
D ruby/khtml (directory)
D ruby/kio (directory)
M +25 -3 ruby/korundum/CMakeLists.txt
A ruby/korundum/modules (directory)
A ruby/korundum/modules/CMakeLists.txt
A ruby/korundum/modules/akonadi (directory)
A ruby/korundum/modules/kate (directory)
A ruby/korundum/modules/kdevplatform (directory)
A ruby/korundum/modules/khtml (directory)
A ruby/korundum/modules/kio (directory)
A ruby/korundum/modules/krossruby (directory)
A ruby/korundum/modules/ktexteditor (directory)
A ruby/korundum/modules/nepomuk (directory)
A ruby/korundum/modules/okular (directory)
A ruby/korundum/modules/plasma (directory)
A ruby/korundum/modules/solid (directory)
A ruby/korundum/modules/soprano (directory)
D ruby/krossruby (directory)
D ruby/ktexteditor (directory)
D ruby/nepomuk (directory)
D ruby/okular (directory)
D ruby/phonon (directory)
D ruby/plasma (directory)
D ruby/qscintilla (directory)
D ruby/qtdeclarative (directory)
M +32 -1 ruby/qtruby/CMakeLists.txt
A ruby/qtruby/modules (directory)
A ruby/qtruby/modules/CMakeLists.txt
A ruby/qtruby/modules/phonon (directory)
A ruby/qtruby/modules/qscintilla (directory)
A ruby/qtruby/modules/qtdeclarative (directory)
A ruby/qtruby/modules/qtscript (directory)
A ruby/qtruby/modules/qttest (directory)
A ruby/qtruby/modules/qtuitools (directory)
A ruby/qtruby/modules/qtwebkit (directory)
A ruby/qtruby/modules/qwt (directory)
M +1 -1 ruby/qtruby/src/Qt.cpp
M +1 -1 ruby/qtruby/src/handlers.cpp
M +1 -1 ruby/qtruby/src/marshall.h
M +1 -1 ruby/qtruby/src/marshall_types.h
M +1 -1 ruby/qtruby/src/qtruby.cpp
M +1 -1 ruby/qtruby/src/qtruby.h
M +1 -1 ruby/qtruby/src/smokeruby.h
D ruby/qtscript (directory)
D ruby/qttest (directory)
D ruby/qtuitools (directory)
D ruby/qtwebkit (directory)
D ruby/qwt (directory)
D ruby/solid (directory)
D ruby/soprano (directory)
M +2 -85 smoke/CMakeLists.txt
D smoke/README
D smoke/akonadi (directory)
D smoke/akonadi_smoke.h
D smoke/attica (directory)
D smoke/attica_smoke.h
D smoke/deptool (directory)
D smoke/kate (directory)
D smoke/kate_smoke.h
A smoke/kde (directory)
A smoke/kde/CMakeLists.txt
A smoke/kde/akonadi (directory)
A smoke/kde/akonadi_smoke.h smoke/akonadi_smoke.h#1198770 [License: \
UNKNOWN] A smoke/kde/attica (directory)
A smoke/kde/attica_smoke.h smoke/attica_smoke.h#1198770 [License: \
UNKNOWN] A smoke/kde/kate (directory)
A smoke/kde/kate_smoke.h smoke/kate_smoke.h#1198770 [License: UNKNOWN]
A smoke/kde/kde_smoke.h smoke/kde_smoke.h#1198770 [License: UNKNOWN]
A smoke/kde/kdecore (directory)
A smoke/kde/kdecore_smoke.h smoke/kdecore_smoke.h#1198770 [License: \
UNKNOWN] A smoke/kde/kdeui (directory)
A smoke/kde/kdeui_smoke.h smoke/kdeui_smoke.h#1198770 [License: \
UNKNOWN] A smoke/kde/kdevplatform (directory)
A smoke/kde/kfile (directory)
A smoke/kde/kfile_smoke.h smoke/kfile_smoke.h#1198770 [License: \
UNKNOWN] A smoke/kde/khtml (directory)
A smoke/kde/khtml_smoke.h smoke/khtml_smoke.h#1198770 [License: \
UNKNOWN] A smoke/kde/kio (directory)
A smoke/kde/kio_smoke.h smoke/kio_smoke.h#1198770 [License: UNKNOWN]
A smoke/kde/knewstuff2 (directory)
A smoke/kde/knewstuff2_smoke.h smoke/knewstuff2_smoke.h#1198770 \
[License: UNKNOWN] A smoke/kde/knewstuff3 (directory)
A smoke/kde/knewstuff3_smoke.h smoke/knewstuff3_smoke.h#1198770 \
[License: UNKNOWN] A smoke/kde/kparts (directory)
A smoke/kde/kparts_smoke.h smoke/kparts_smoke.h#1198770 [License: \
UNKNOWN] A smoke/kde/ktexteditor (directory)
A smoke/kde/ktexteditor_smoke.h smoke/ktexteditor_smoke.h#1198770 \
[License: UNKNOWN] A smoke/kde/kutils (directory)
A smoke/kde/kutils_smoke.h smoke/kutils_smoke.h#1198770 [License: \
UNKNOWN] A smoke/kde/nepomuk (directory)
A smoke/kde/nepomuk_smoke.h smoke/nepomuk_smoke.h#1198770 [License: \
UNKNOWN] A smoke/kde/nepomukquery (directory)
A smoke/kde/nepomukquery_smoke.h smoke/nepomukquery_smoke.h#1198770 \
[License: UNKNOWN] A smoke/kde/okular (directory)
A smoke/kde/okular_smoke.h smoke/okular_smoke.h#1198770 [License: \
UNKNOWN] A smoke/kde/plasma (directory)
A smoke/kde/plasma_smoke.h smoke/plasma_smoke.h#1198770 [License: \
UNKNOWN] A smoke/kde/solid (directory)
A smoke/kde/solid_smoke.h smoke/solid_smoke.h#1198770 [License: \
UNKNOWN] A smoke/kde/soprano (directory)
A smoke/kde/soprano_smoke.h smoke/soprano_smoke.h#1198770 [License: \
UNKNOWN] A smoke/kde/sopranoclient (directory)
A smoke/kde/sopranoclient_smoke.h smoke/sopranoclient_smoke.h#1198770 \
[License: UNKNOWN] A smoke/kde/sopranoserver (directory)
A smoke/kde/sopranoserver_smoke.h smoke/sopranoserver_smoke.h#1198770 \
[License: UNKNOWN] D smoke/kde_smoke.h
D smoke/kdecore (directory)
D smoke/kdecore_smoke.h
D smoke/kdeui (directory)
D smoke/kdeui_smoke.h
D smoke/kdevplatform (directory)
D smoke/kfile (directory)
D smoke/kfile_smoke.h
D smoke/khtml (directory)
D smoke/khtml_smoke.h
D smoke/kio (directory)
D smoke/kio_smoke.h
D smoke/knewstuff2 (directory)
D smoke/knewstuff2_smoke.h
D smoke/knewstuff3 (directory)
D smoke/knewstuff3_smoke.h
D smoke/kparts (directory)
D smoke/kparts_smoke.h
D smoke/ktexteditor (directory)
D smoke/ktexteditor_smoke.h
D smoke/kutils (directory)
D smoke/kutils_smoke.h
D smoke/nepomuk (directory)
D smoke/nepomuk_smoke.h
D smoke/nepomukquery (directory)
D smoke/nepomukquery_smoke.h
D smoke/okular (directory)
D smoke/okular_smoke.h
D smoke/phonon (directory)
D smoke/phonon_smoke.h
D smoke/plasma (directory)
D smoke/plasma_smoke.h
D smoke/qimageblitz (directory)
D smoke/qimageblitz_smoke.h
D smoke/qsci (directory)
D smoke/qsci_smoke.h
A smoke/qt (directory)
A smoke/qt/CMakeLists.txt
A smoke/qt/phonon (directory)
A smoke/qt/phonon_smoke.h smoke/phonon_smoke.h#1198770 [License: \
UNKNOWN] A smoke/qt/qimageblitz (directory)
A smoke/qt/qimageblitz_smoke.h smoke/qimageblitz_smoke.h#1198770 \
[License: UNKNOWN] A smoke/qt/qsci (directory)
A smoke/qt/qsci_smoke.h smoke/qsci_smoke.h#1198770 [License: UNKNOWN]
A smoke/qt/qt3support (directory)
A smoke/qt/qt3support_smoke.h smoke/qt3support_smoke.h#1198770 \
[License: UNKNOWN] A smoke/qt/qt_smoke.h smoke/qt_smoke.h#1198770 \
[License: UNKNOWN] A smoke/qt/qtcore (directory)
A smoke/qt/qtcore_smoke.h smoke/qtcore_smoke.h#1198770 [License: \
UNKNOWN] A smoke/qt/qtdbus (directory)
A smoke/qt/qtdbus_smoke.h smoke/qtdbus_smoke.h#1198770 [License: \
UNKNOWN] A smoke/qt/qtdeclarative (directory)
A smoke/qt/qtdeclarative_smoke.h smoke/qtdeclarative_smoke.h#1198770 \
[License: UNKNOWN] A smoke/qt/qtgui (directory)
A smoke/qt/qtgui_smoke.h smoke/qtgui_smoke.h#1198770 [License: \
UNKNOWN] A smoke/qt/qthelp (directory)
A smoke/qt/qthelp_smoke.h smoke/qthelp_smoke.h#1198770 [License: \
UNKNOWN] A smoke/qt/qtmultimedia (directory)
A smoke/qt/qtmultimedia_smoke.h smoke/qtmultimedia_smoke.h#1198770 \
[License: UNKNOWN] A smoke/qt/qtnetwork (directory)
A smoke/qt/qtnetwork_smoke.h smoke/qtnetwork_smoke.h#1198770 [License: \
UNKNOWN] A smoke/qt/qtopengl (directory)
A smoke/qt/qtopengl_smoke.h smoke/qtopengl_smoke.h#1198770 [License: \
UNKNOWN] A smoke/qt/qtscript (directory)
A smoke/qt/qtscript_smoke.h smoke/qtscript_smoke.h#1198770 [License: \
UNKNOWN] A smoke/qt/qtsql (directory)
A smoke/qt/qtsql_smoke.h smoke/qtsql_smoke.h#1198770 [License: \
UNKNOWN] A smoke/qt/qtsvg (directory)
A smoke/qt/qtsvg_smoke.h smoke/qtsvg_smoke.h#1198770 [License: \
UNKNOWN] A smoke/qt/qttest (directory)
A smoke/qt/qttest_smoke.h smoke/qttest_smoke.h#1198886 [License: \
UNKNOWN] A smoke/qt/qtuitools (directory)
A smoke/qt/qtuitools_smoke.h smoke/qtuitools_smoke.h#1198886 [License: \
UNKNOWN] A smoke/qt/qtwebkit (directory)
A smoke/qt/qtwebkit_smoke.h smoke/qtwebkit_smoke.h#1198886 [License: \
UNKNOWN] A smoke/qt/qtxml (directory)
A smoke/qt/qtxml_smoke.h smoke/qtxml_smoke.h#1198886 [License: \
UNKNOWN] A smoke/qt/qtxmlpatterns (directory)
A smoke/qt/qtxmlpatterns_smoke.h smoke/qtxmlpatterns_smoke.h#1198886 \
[License: UNKNOWN] A smoke/qt/qwt (directory)
A smoke/qt/qwt_smoke.h smoke/qwt_smoke.h#1198770 [License: UNKNOWN]
D smoke/qt3support (directory)
D smoke/qt3support_smoke.h
D smoke/qt_smoke.h
D smoke/qtcore (directory)
D smoke/qtcore_smoke.h
D smoke/qtdbus (directory)
D smoke/qtdbus_smoke.h
D smoke/qtdeclarative (directory)
D smoke/qtdeclarative_smoke.h
D smoke/qtgui (directory)
D smoke/qtgui_smoke.h
D smoke/qthelp (directory)
D smoke/qthelp_smoke.h
D smoke/qtmultimedia (directory)
D smoke/qtmultimedia_smoke.h
D smoke/qtnetwork (directory)
D smoke/qtnetwork_smoke.h
D smoke/qtopengl (directory)
D smoke/qtopengl_smoke.h
D smoke/qtscript (directory)
D smoke/qtscript_smoke.h
D smoke/qtsql (directory)
D smoke/qtsql_smoke.h
D smoke/qtsvg (directory)
D smoke/qtsvg_smoke.h
D smoke/qttest (directory)
D smoke/qttest_smoke.h
D smoke/qtuitools (directory)
D smoke/qtuitools_smoke.h
D smoke/qtwebkit (directory)
D smoke/qtwebkit_smoke.h
D smoke/qtxml (directory)
D smoke/qtxml_smoke.h
D smoke/qtxmlpatterns (directory)
D smoke/qtxmlpatterns_smoke.h
D smoke/qwt (directory)
D smoke/qwt_smoke.h
D smoke/smoke.h
D smoke/smokeapi (directory)
D smoke/smokebase (directory)
D smoke/solid (directory)
D smoke/solid_smoke.h
D smoke/soprano (directory)
D smoke/soprano_smoke.h
D smoke/sopranoclient (directory)
D smoke/sopranoclient_smoke.h
D smoke/sopranoserver (directory)
D smoke/sopranoserver_smoke.h
--- trunk/KDE/kdebindings/CMakeLists.txt #1199319:1199320
@@ -14,37 +14,6 @@
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
-set(SOPRANO_MIN_VERSION "2.0")
-macro_optional_find_package(LibAttica)
-macro_log_feature(LIBATTICA_FOUND "libattica" "LibAttica" "http://www.kde.org" FALSE \
"" "Needed to compile libattica bindings")
-
-macro_optional_find_package(QImageBlitz)
-macro_log_feature(QIMAGEBLITZ_FOUND "QImageBlitz" "QImageBlitz library" \
"http://www.kde.org" FALSE "" "Needed to compile QImageBlitz \
bindings")
-
-macro_optional_find_package(Qwt5)
-macro_log_feature(Qwt5_Qt4_FOUND "Qwt5 for Qt4" "Qwt5 libraries for Qt4" \
"http://qwt.sourceforge.net" FALSE "" "Needed to compile Qwt5 \
bindings")
-
-macro_optional_find_package(Phonon)
-macro_log_feature(PHONON_FOUND "Phonon" "Phonon multimedia framework" \
"http://www.kde.org" FALSE "" "Needed to compile Phonon bindings")
-
-macro_optional_find_package(Soprano)
-macro_log_feature(SOPRANO_FOUND "Soprano" "Soprano libraries" \
"http://soprano.sourceforge.net" FALSE "" "Needed to compile Soprano \
bindings")
-
-macro_optional_find_package(Nepomuk)
-macro_log_feature(NEPOMUK_FOUND "Nepomuk" "Nepomuk libraries" "http://www.kde.org" \
FALSE "" "Needed to compile Nepomuk bindings")
-
-macro_optional_find_package(KdepimLibs)
-macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" \
"http://www.kde.org" FALSE "" "Needed to compile Akonadi bindings")
-
-macro_optional_find_package(Akonadi)
-macro_log_feature(AKONADI_FOUND "Akonadi" "Akonadi libraries" "http://www.kde.org" \
FALSE "" "Needed to compile Akonadi bindings")
-
-macro_optional_find_package(QScintilla)
-macro_log_feature(QSCINTILLA_FOUND "QScintilla2" "QScintilla2 libraries" \
"http://www.riverbankcomputing.co.uk/software/qscintilla/intro" FALSE "" "Needed to \
compile QScintilla2 bindings")
-
-macro_optional_find_package(Okular)
-macro_log_feature(OKULAR_FOUND "Okular" "Okular libraries" "http://www.kde.org" \
FALSE "" "Needed to compile Okular bindings")
-
macro_optional_add_subdirectory(smoke)
macro_optional_add_subdirectory(ruby)
macro_optional_add_subdirectory(python)
--- trunk/KDE/kdebindings/generator/CMakeLists.txt #1199319:1199320
@@ -34,5 +34,9 @@
install(TARGETS smokegen DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
install(FILES generatorenvironment.h generator_export.h generatorpreprocessor.h \
generatorvisitor.h name_compiler.h options.h type_compiler.h type.h DESTINATION \
${CMAKE_INSTALL_PREFIX}/include/smokegen) +install( FILES smoke.h DESTINATION \
${CMAKE_INSTALL_PREFIX}/include )
add_subdirectory(generators)
+add_subdirectory(smokeapi)
+add_subdirectory(smokebase)
+add_subdirectory(deptool)
--- trunk/KDE/kdebindings/ruby/CMakeLists.txt #1199319:1199320
@@ -1,109 +1,3 @@
-project(Ruby)
+add_subdirectory( qtruby )
+add_subdirectory( korundum )
-set(COMPILE_RUBY FALSE CACHE INTERNAL "")
-
-macro_optional_find_package(Ruby)
-
-if (RUBY_LIBRARY AND RUBY_INCLUDE_DIRS AND RUBY_EXECUTABLE)
- set(COMPILE_RUBY TRUE CACHE INTERNAL "")
-endif (RUBY_LIBRARY AND RUBY_INCLUDE_DIRS AND RUBY_EXECUTABLE)
-
-macro_log_feature(COMPILE_RUBY "Ruby" "Ruby interpreter and libraries" \
"http://www.ruby-lang.org" FALSE "" "Needed to compile the Ruby \
bindings")
-
-if (NOT COMPILE_RUBY)
- return()
-endif (NOT COMPILE_RUBY)
-
-SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation \
directory for ruby binary extension" )
-SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation \
directory for ruby extension" )
-
-# compute an overall version number which can be compared at once
-MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + \
${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
-
-macro_optional_add_bindings(QT_QTCORE_FOUND "QtRuby" qtruby)
-macro_optional_add_bindings(QT_QTDECLARATIVE_FOUND "QtDeclarative" qtdeclarative)
-macro_optional_add_bindings(QT_QTWEBKIT_FOUND "QtWebKit" qtwebkit)
-macro_optional_add_bindings(QT_QTUITOOLS_FOUND "QtUiTools" qtuitools)
-macro_optional_add_bindings(QT_QTSCRIPT_FOUND "QtScript" qtscript)
-macro_optional_add_bindings(QT_QTTEST_FOUND "QtTest" qttest)
-
-macro_optional_add_bindings(PHONON_FOUND "Phonon" phonon)
-
-macro_optional_add_bindings(QSCINTILLA_FOUND "QScintilla" qscintilla)
-
-macro_optional_add_bindings(Qwt5_Qt4_FOUND "Qwt" qwt)
-
-macro_optional_add_bindings(Soprano_FOUND "Soprano" soprano)
-
-if(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
- set(BUILD_Akonadi TRUE)
-else(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
- set(BUILD_Akonadi FALSE)
-endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
-macro_optional_add_bindings(BUILD_Akonadi "Akonadi" akonadi)
-
-macro_optional_add_bindings(KDE4_FOUND "Korundum" korundum)
-macro_optional_add_bindings(KDE4_FOUND "KIO" kio)
-macro_optional_add_bindings(KDE4_FOUND "KHTML" khtml)
-macro_optional_add_bindings(KDE4_FOUND "KTextEditor" ktexteditor)
-macro_optional_add_bindings(KDE4_FOUND "Solid" solid)
-macro_optional_add_bindings(KDE4_FOUND "Plasma" plasma)
-
-# For nepomuk, we also must have found soprano, since soprano headers are used:
-if(Soprano_FOUND AND Nepomuk_FOUND)
- set(BUILD_Nepomuk TRUE)
-else(Soprano_FOUND AND Nepomuk_FOUND)
- set(BUILD_Nepomuk FALSE)
-endif(Soprano_FOUND AND Nepomuk_FOUND)
-macro_optional_add_bindings(BUILD_Nepomuk "Nepomuk" nepomuk)
-
-macro_optional_add_bindings(OKULAR_FOUND "Okular" okular)
-
-find_library(KATEINTERFACES_LIBRARY kateinterfaces HINTS ${KDE4_LIB_DIR})
-find_path(KATE_INCLUDE_DIR kate/plugin.h HINTS ${KDE4_INCLUDE_DIR})
-
-macro_optional_add_bindings(KATE_INCLUDE_DIR "Kate" kate)
-
-#####################################################################
-# Kross Ruby
-
-OPTION(ENABLE_KROSSRUBY "build Kross Ruby scripting library" ON)
-#OPTION(ENABLE_KROSSRUBY "build Kross Ruby scripting library" OFF)
-
-if (RUBY_EXECUTABLE AND RUBY_LIBRARY AND RUBY_INCLUDE_DIRS)
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r mkmf -e \
"exit(have_func('rb_hash_foreach') ? 0 : 1)" RESULT_VARIABLE RUBY_HASH_FOREACH \
OUTPUT_QUIET)
- if (RUBY_HASH_FOREACH EQUAL 0)
-
- set(CMAKE_REQUIRED_INCLUDES ${RUBY_INCLUDE_DIRS})
- set(CMAKE_REQUIRED_LIBRARIES ${RUBY_LIBRARY})
- CHECK_CXX_SOURCE_COMPILES("
- #include <ruby.h>
- int main() { ruby_init(); return 0; }" RubyCompiles)
- if(RubyCompiles)
- if(ENABLE_KROSSRUBY AND RUBY_VERSION_MAJOR EQUAL 1 AND \
RUBY_VERSION_MINOR LESS 9)
- set(BUILD_KrossRuby TRUE)
- endif(ENABLE_KROSSRUBY AND RUBY_VERSION_MAJOR EQUAL 1 AND \
RUBY_VERSION_MINOR LESS 9)
- else(RubyCompiles)
- message(STATUS "Failed to compile a C++ program that embeds ruby.")
- endif(RubyCompiles)
-
- else (RUBY_HASH_FOREACH EQUAL 0)
-
- # 2007-02-12 sebsauer; this is a workaround for the case we failed to load
- # the "mkmf" library what is the case e.g. on some debian distributions.
- #EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r mkmf -e "exit(0)" \
RESULT_VARIABLE RUBY_HASH_FOREACH OUTPUT_QUIET ERROR_QUIET)
- #if (${RUBY_HASH_FOREACH} EQUAL 0)
- message(STATUS "The detected Ruby is too old for kross. A Ruby which has \
rb_hash_foreach is required. Upgrade to 1.8.2 or later")
- #else (${RUBY_HASH_FOREACH} EQUAL 0)
- # message(STATUS "Failed to load the Ruby mkmf library. Please install \
the Ruby developer packages.")
- #endif (${RUBY_HASH_FOREACH} EQUAL 0)
-
- endif (RUBY_HASH_FOREACH EQUAL 0)
-endif (RUBY_EXECUTABLE AND RUBY_LIBRARY AND RUBY_INCLUDE_DIRS)
-message(STATUS "Ruby Executable: " ${RUBY_EXECUTABLE})
-message(STATUS "Ruby Libraries: " ${RUBY_LIBRARY})
-message(STATUS "Ruby Include Directories: " ${RUBY_INCLUDE_DIRS})
-
-macro_optional_add_bindings(BUILD_KrossRuby "KrossRuby" krossruby)
-
-macro_display_bindings_log()
--- trunk/KDE/kdebindings/ruby/korundum/CMakeLists.txt #1199319:1199320
@@ -1,4 +1,26 @@
-add_subdirectory( examples )
-add_subdirectory( src )
-add_subdirectory( tools )
+project(Korundum)
+set(COMPILE_RUBY FALSE CACHE INTERNAL "")
+
+find_package(Ruby REQUIRED)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+if (RUBY_LIBRARY AND RUBY_INCLUDE_DIRS AND RUBY_EXECUTABLE)
+ set(COMPILE_RUBY TRUE CACHE INTERNAL "")
+endif (RUBY_LIBRARY AND RUBY_INCLUDE_DIRS AND RUBY_EXECUTABLE)
+
+macro_log_feature(COMPILE_RUBY "Ruby" "Ruby interpreter and libraries" \
"http://www.ruby-lang.org" FALSE "" "Needed to compile the Ruby bindings") +
+if (NOT COMPILE_RUBY)
+ return()
+endif (NOT COMPILE_RUBY)
+
+SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation \
directory for ruby binary extension" ) +SET(CUSTOM_RUBY_SITE_LIB_DIR \
${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" ) +
+# compute an overall version number which can be compared at once
+MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + \
${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}") +
+
+macro_display_bindings_log()
--- trunk/KDE/kdebindings/ruby/qtruby/CMakeLists.txt #1199319:1199320
@@ -1,4 +1,35 @@
+project(QtRuby)
+
+set(COMPILE_RUBY FALSE CACHE INTERNAL "")
+
+find_package(Ruby REQUIRED)
+find_package(Qt4 REQUIRED)
+
+if (RUBY_LIBRARY AND RUBY_INCLUDE_DIRS AND RUBY_EXECUTABLE)
+ set(COMPILE_RUBY TRUE CACHE INTERNAL "")
+endif (RUBY_LIBRARY AND RUBY_INCLUDE_DIRS AND RUBY_EXECUTABLE)
+
+macro_log_feature(COMPILE_RUBY "Ruby" "Ruby interpreter and libraries" \
"http://www.ruby-lang.org" FALSE "" "Needed to compile the Ruby bindings") +
+if (NOT COMPILE_RUBY)
+ return()
+endif (NOT COMPILE_RUBY)
+
+SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation \
directory for ruby binary extension" ) +SET(CUSTOM_RUBY_SITE_LIB_DIR \
${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" ) +
+# compute an overall version number which can be compared at once
+MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + \
${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}") +
+
+message(STATUS "Ruby Executable: " ${RUBY_EXECUTABLE})
+message(STATUS "Ruby Libraries: " ${RUBY_LIBRARY})
+message(STATUS "Ruby Include Directories: " ${RUBY_INCLUDE_DIRS})
+
+macro_display_bindings_log()
+
add_subdirectory( bin )
+add_subdirectory( modules )
+add_subdirectory( rails_support )
add_subdirectory( src )
-add_subdirectory( rails_support )
add_subdirectory( tools )
--- trunk/KDE/kdebindings/ruby/qtruby/src/Qt.cpp #1199319:1199320
@@ -62,7 +62,7 @@
#include <ruby.h>
-#include <smoke/smoke.h>
+#include <smoke.h>
#include <smoke/qtcore_smoke.h>
#undef free
--- trunk/KDE/kdebindings/ruby/qtruby/src/handlers.cpp #1199319:1199320
@@ -64,7 +64,7 @@
#include <QtNetwork/qnetworkcookie.h>
#endif
-#include <smoke/smoke.h>
+#include <smoke.h>
#undef DEBUG
#ifndef _GNU_SOURCE
--- trunk/KDE/kdebindings/ruby/qtruby/src/marshall.h #1199319:1199320
@@ -10,7 +10,7 @@
#ifndef MARSHALL_H
#define MARSHALL_H
-#include <smoke/smoke.h>
+#include <smoke.h>
#include <ruby.h>
class SmokeType;
--- trunk/KDE/kdebindings/ruby/qtruby/src/marshall_types.h #1199319:1199320
@@ -23,7 +23,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qmetaobject.h>
-#include <smoke/smoke.h>
+#include <smoke.h>
#include "marshall.h"
#include "qtruby.h"
--- trunk/KDE/kdebindings/ruby/qtruby/src/qtruby.cpp #1199319:1199320
@@ -43,7 +43,7 @@
#include <QtDBus/qdbusargument.h>
#endif
-#include <smoke/smoke.h>
+#include <smoke.h>
#include <smoke/qtcore_smoke.h>
#include <smoke/qtgui_smoke.h>
--- trunk/KDE/kdebindings/ruby/qtruby/src/qtruby.h #1199319:1199320
@@ -19,7 +19,7 @@
#define QTRUBY_H
#include <QHash>
-#include <smoke/smoke.h>
+#include <smoke.h>
#include "marshall.h"
--- trunk/KDE/kdebindings/ruby/qtruby/src/smokeruby.h #1199319:1199320
@@ -10,7 +10,7 @@
#ifndef SMOKERUBY_H
#define SMOKERUBY_H
-#include <smoke/smoke.h>
+#include <smoke.h>
#undef DEBUG
#ifndef _GNU_SOURCE
--- trunk/KDE/kdebindings/smoke/CMakeLists.txt #1199319:1199320
@@ -1,85 +1,2 @@
-project(SMOKE)
-
-add_definitions(-DSMOKE_BUILDING)
-
-add_subdirectory(smokebase)
-add_subdirectory(qtcore)
-add_subdirectory(deptool)
-add_subdirectory(smokeapi)
-
-macro_optional_add_bindings(QT_QTNETWORK_FOUND "QtNetwork" qtnetwork)
-macro_optional_add_bindings(QT_QTDBUS_FOUND "QtDBus" qtdbus)
-macro_optional_add_bindings(QT_QTDECLARATIVE_FOUND "QtDeclarative" qtdeclarative)
-macro_optional_add_bindings(QT_QTGUI_FOUND "QtGui" qtgui)
-macro_optional_add_bindings(QT_QTSVG_FOUND "QtSvg" qtsvg)
-macro_optional_add_bindings(QT_QTSQL_FOUND "QtSql" qtsql)
-macro_optional_add_bindings(QT_QTXML_FOUND "QtXml" qtxml)
-macro_optional_add_bindings(QT_QTXMLPATTERNS_FOUND "QtXmlPatterns" qtxmlpatterns)
-macro_optional_add_bindings(QT_QTOPENGL_FOUND "QtOpenGL" qtopengl)
-macro_optional_add_bindings(QT_QTWEBKIT_FOUND "QtWebKit" qtwebkit)
-macro_optional_add_bindings(QT_QTSCRIPT_FOUND "QtScript" qtscript)
-macro_optional_add_bindings(QT_QTUITOOLS_FOUND "QtUiTools" qtuitools)
-macro_optional_add_bindings(QT_QTTEST_FOUND "QtTest" qttest)
-macro_optional_add_bindings(QT_QTMULTIMEDIA_FOUND "QtMultimedia" qtmultimedia)
-macro_optional_add_bindings(QT_QT3SUPPORT_FOUND "Qt3Support" qt3support)
-macro_optional_add_bindings(QT_QTHELP_FOUND "QtHelp" qthelp)
-
-macro_optional_add_bindings(PHONON_FOUND "Phonon" phonon)
-
-macro_optional_add_bindings(QSCINTILLA_FOUND "QScintilla" qsci)
-
-macro_optional_add_bindings(Qwt5_Qt4_FOUND "Qwt" qwt)
-
-macro_optional_add_bindings(QIMAGEBLITZ_FOUND "QImageBlitz" qimageblitz)
-
-macro_optional_add_bindings(KDE4_FOUND "KDECore" kdecore)
-macro_optional_add_bindings(KDE4_FOUND "KDEUi" kdeui)
-macro_optional_add_bindings(KDE4_FOUND "KIO" kio)
-macro_optional_add_bindings(KDE4_FOUND "KParts" kparts)
-macro_optional_add_bindings(KDE4_FOUND "KFile" kfile)
-macro_optional_add_bindings(KDE4_FOUND "KNewStuff2" knewstuff2)
-macro_optional_add_bindings(KDE4_FOUND "KNewStuff3" knewstuff3)
-macro_optional_add_bindings(KDE4_FOUND "KUtils" kutils)
-macro_optional_add_bindings(KDE4_FOUND "KHTML" khtml)
-macro_optional_add_bindings(KDE4_FOUND "KTextEditor" ktexteditor)
-macro_optional_add_bindings(KDE4_FOUND "Solid" solid)
-macro_optional_add_bindings(KDE4_FOUND "Plasma" plasma)
-
-macro_optional_add_bindings(Soprano_FOUND "Soprano" soprano sopranoclient \
sopranoserver)
-
-if(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
- set(BUILD_Akonadi TRUE)
-else(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
- set(BUILD_Akonadi FALSE)
-endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
-macro_optional_add_bindings(BUILD_Akonadi "Akonadi" akonadi)
-
-macro_optional_add_bindings(LIBATTICA_FOUND "Attica" attica)
-
-macro_optional_add_bindings(Nepomuk_FOUND "Nepomuk" nepomuk nepomukquery)
-
-macro_optional_add_bindings(OKULAR_FOUND "Okular" okular)
-
-find_library(KATEINTERFACES_LIBRARY kateinterfaces HINTS ${KDE4_LIB_DIR})
-find_path(KATE_INCLUDE_DIR kate/plugin.h HINTS ${KDE4_INCLUDE_DIR})
-
-macro_optional_add_bindings(KATE_INCLUDE_DIR "Kate" kate)
-
-# for qtguess.pl
-if (APPLE)
-set(qt_test_threshold 15)
-else (APPLE)
-set(qt_test_threshold 10)
-endif (APPLE)
-
-macro_display_bindings_log()
-
-########### install files ###############
-
-# KDE specific
-#install( FILES smoke.h DESTINATION ${INCLUDE_INSTALL_DIR} )
-
-# Qt only
-#install( FILES smoke.h DESTINATION ${INSTALL_DIR}/include )
-
-install( FILES smoke.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include )
+add_subdirectory(qt)
+add_subdirectory(kde)
\ No newline at end of file
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic