@@ -1,13 +1,8 @@ PROJECT(QtWine) -# This is ANSI C only. no need for KDE. ADD_SUBDIRECTORY(terminal-helper) +ADD_SUBDIRECTORY(libqtwine) -# Find KDE4, needed by other targets. -FIND_PACKAGE(KDE4 REQUIRED) -INCLUDE_DIRECTORIES(${KDE4_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/libqtwine/src) -ADD_DEFINITIONS(${KDE4_DEFINITIONS}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libqtwine/src) LINK_DIRECTORIES(${CMAKE_CURRENT_BUILD_DIR}/lib) - -ADD_SUBDIRECTORY(libqtwine) ADD_SUBDIRECTORY(qtwine) CMakeLists.txt @@ -1,9 +1,8 @@ PROJECT(libqtwine) -IF (CONFIGURE_OUTSIDE_QTWINE_TREE) - FIND_PACKAGE(KDE4 REQUIRED) - INCLUDE_DIRECTORIES(${KDE4_INCLUDES}) - ADD_DEFINITIONS(${KDE4_DEFINITIONS}) -ENDIF (CONFIGURE_OUTSIDE_QTWINE_TREE) +FIND_PACKAGE(Automoc4 REQUIRED) +FIND_PACKAGE(Qt4 REQUIRED) +SET(QT_USE_QTNETWORK 1) +INCLUDE(${QT_USE_FILE}) ADD_SUBDIRECTORY(src) libqtwine/CMakeLists.txt @@ -52,8 +52,8 @@ SET( LIBQTWINE_PUBLIC_HEADERS INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # add build target -KDE4_ADD_LIBRARY(libqtwine SHARED ${LIBQTWINE_SOURCES}) -TARGET_LINK_LIBRARIES(libqtwine ${KDE4_KDECORE_LIBS} ${QT_QTNETWORK_LIBRARY}) +AUTOMOC4_ADD_LIBRARY(libqtwine SHARED ${LIBQTWINE_SOURCES}) +TARGET_LINK_LIBRARIES(libqtwine ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY}) # set library version SET_TARGET_PROPERTIES(libqtwine PROPERTIES VERSION ${LIBQTWINE_VERSION} SOVERSION ${LIBQTWINE_API_VERSION} OUTPUT_NAME qtwine) @@ -62,8 +62,8 @@ SET_TARGET_PROPERTIES(libqtwine PROPERTIES VERSION ${LIBQTWINE_VERSION} SOVERSIO CONFIGURE_FILE("libqtwine.pc.in" "libqtwine.pc" @ONLY) # setup the "make install" target -INSTALL(TARGETS libqtwine DESTINATION ${LIB_INSTALL_DIR} COMPONENT runtime) -INSTALL(FILES "${CMAKE_BINARY_DIR}/libqtwine.pc" DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT development) +INSTALL(TARGETS libqtwine DESTINATION lib COMPONENT runtime) +INSTALL(FILES "${CMAKE_BINARY_DIR}/libqtwine.pc" DESTINATION lib/pkgconfig COMPONENT development) FOREACH(header ${LIBQTWINE_PUBLIC_HEADERS}) GET_FILENAME_COMPONENT(header_path ${header} PATH) INSTALL(FILES ${header} DESTINATION include/qtwine/${header_path} COMPONENT development) libqtwine/src/CMakeLists.txt @@ -1,11 +1,11 @@ PROJECT(qtwine_bin) -IF (CONFIGURE_OUTSIDE_QTWINE_TREE) - #find KDE4 - FIND_PACKAGE(KDE4 REQUIRED) - INCLUDE_DIRECTORIES(${KDE4_INCLUDES}) - ADD_DEFINITIONS(${KDE4_DEFINITIONS}) +#find KDE4 +FIND_PACKAGE(KDE4 REQUIRED) +INCLUDE_DIRECTORIES(${KDE4_INCLUDES}) +ADD_DEFINITIONS(${KDE4_DEFINITIONS}) +IF (CONFIGURE_OUTSIDE_QTWINE_TREE) #find libqtwine using pkg-config FIND_PACKAGE(PkgConfig REQUIRED) PKG_SEARCH_MODULE(LIBQTWINE_PKG REQUIRED libqtwine) qtwine/CMakeLists.txt 455880974cfc95413dca037738ac83fb541c2338 George Kiagiadakis gkiagia@users.sourceforge.net http://github.com/gkiagia/qtwine/commit/6e4570ab6d1f9dde9ca2467f9534c820f8373f9c 6e4570ab6d1f9dde9ca2467f9534c820f8373f9c 2009-02-08T06:46:27-08:00 2009-02-08T06:46:27-08:00 Modify CMakeLists.txt to build libqtwine without kdelibs. d74e5ee9cccf7a0c1524e4b76b5b2f7bd8271697 George Kiagiadakis gkiagia@users.sourceforge.net