Permalink
Browse files

Export extensions symbol. Fix installation.

  • Loading branch information...
1 parent 08e09ee commit 2412072bd35327a4da91a0209c0f367b1769b4aa @pcapriotti committed Jun 29, 2009
Showing with 9 additions and 14 deletions.
  1. +3 −2 CMakeLists.txt
  2. +4 −7 lib/ext/CMakeLists.txt
  3. +2 −5 lib/ext/extensions.cpp
View
@@ -9,8 +9,9 @@ add_subdirectory(lib)
configure_file(main.rb main.rb)
install(DIRECTORY lib DESTINATION ${DATA_INSTALL_DIR}/kaya
- PATTERN "*rc" EXCLUDE
- PATTERN "*.desktop" EXCLUDE)
+ FILES_MATCHING PATTERN "*.rb"
+ PATTERN "plugins" EXCLUDE)
+install(DIRECTORY lib/plugins DESTINATION ${DATA_INSTALL_DIR}/kaya/lib)
install(FILES ${PROJECT_BINARY_DIR}/main.rb
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
View
@@ -1,20 +1,17 @@
find_package(Qt4 REQUIRED)
find_package(Ruby REQUIRED)
-add_definitions(${QT_DEFINITIONS})
-include_directories(${QT_INCLUDES})
-
+add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+include_directories(${KDE4_INCLUDES} ${RUBY_INCLUDE_PATH})
set(src extensions.cpp expblur.cpp)
qt4_wrap_cpp(src extensions.h)
add_library(extensions SHARED ${src})
set_target_properties(extensions PROPERTIES PREFIX "")
+target_link_libraries(extensions ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${RUBY_LIBRARY})
-message("lib: ${QT_QTGUI_LIBRARY}")
-target_link_libraries(extensions ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-
-# install(TARGETS ksimple DESTINATION bin)
+install(TARGETS extensions DESTINATION ${DATA_INSTALL_DIR}/kaya/lib/ext)
View
@@ -1,6 +1,7 @@
#include "extensions.h"
#include <QCoreApplication>
+#include <kdemacros.h>
Extensions::Extensions(QObject* parent)
: QObject(parent) { }
@@ -11,10 +12,6 @@ static void init()
ext->setObjectName("kaya extensions");
}
-extern "C" {
-
-void Init_extensions() {
+extern "C" KDE_EXPORT void Init_extensions() {
init();
}
-
-};

0 comments on commit 2412072

Please sign in to comment.