OK, here're a couple of patch files for the main and src CMakeList files. It's
been more or less a straight swap of QT3 to QT4 and likewise for KDE3 macros
and lists. The DCOP stuff's been removed as it doesn't exist in KDE4. There
also seems to be no equivalent for the KDE3 automoc stuff so I've used the
QT4 automoc macro instead. So far I'm sticking with the default QtCore and
QtGui includes. Are we using any other bits of Qt? Also, I'm using KDE4's
macros to find Qt (FIND_PACKAGE(KDE4...)) for now.
Anyhoo this has been tested on SuSE 11 only and generated a working make file
for me. If anyone else fancies giving it a shot, let me know how you get on.
David
Index: src/CMakeLists.txt
===================================================================
--- src/CMakeLists.txt (revision 9144)
+++ src/CMakeLists.txt (working copy)
@@ -7,7 +7,7 @@
ENDIF(USE_PCH)
LINK_DIRECTORIES(
- ${KDE3_LIB_DIR}
+ ${KDE4_LIB_DIR}
${ALSA_LIB_DIR}
${JACK_LIB_DIR}
${XFT_LIB_DIR}
@@ -19,7 +19,7 @@
INCLUDE_DIRECTORIES(AFTER
${QT_INCLUDE_DIR}
- ${KDE3_INCLUDE_DIR}
+ ${KDE4_INCLUDE_DIR}
${ALSA_INC_DIR}
${JACK_INC_DIR}
${XFT_INC_DIR}
@@ -41,7 +41,7 @@
# Sound sources
INCLUDE(SoundFileList.txt)
-KDE3_AUTOMOC(${common_sound_SRCS})
+QT4_AUTOMOC(${common_sound_SRCS})
ADD_LIBRARY(RosegardenCommon STATIC
${base_SRCS}
@@ -65,14 +65,14 @@
# gui executable
INCLUDE(GUIFileList.txt)
-KDE3_ADD_DCOP_SKELS(gui_SRCS ${gui_dcop_SRCS})
-KDE3_ADD_DCOP_STUBS(gui_SRCS ${gui_dcop_SRCS})
-KDE3_ADD_UI_FILES(gui_SRCS ${ui_SRCS})
-KDE3_AUTOMOC(${gui_SRCS})
-KDE3_AUTOMOC(${segmentcanvas_SRCS})
-KDE3_AUTOMOC(${commands_SRCS})
-KDE3_AUTOMOC(${document_SRCS})
-KDE3_AUTOMOC(${sequencer_SRCS})
+#KDE4_ADD_DCOP_SKELS(gui_SRCS ${gui_dcop_SRCS})
+#KDE4_ADD_DCOP_STUBS(gui_SRCS ${gui_dcop_SRCS})
+KDE4_ADD_UI_FILES(gui_SRCS ${ui_SRCS})
+QT4_AUTOMOC(${gui_SRCS})
+QT4_AUTOMOC(${segmentcanvas_SRCS})
+QT4_AUTOMOC(${commands_SRCS})
+QT4_AUTOMOC(${document_SRCS})
+QT4_AUTOMOC(${sequencer_SRCS})
ADD_LIBRARY(RosegardenExtended STATIC
${document_SRCS}
@@ -106,7 +106,7 @@
-KDE3_ADD_EXECUTABLE(rosegarden
+KDE4_ADD_EXECUTABLE(rosegarden
#${commands_SRCS}
#${document_SRCS}
#${gui_SRCS}
@@ -141,19 +141,19 @@
# Install targets
INSTALL(TARGETS rosegarden
- RUNTIME DESTINATION ${KDE3EXECDIR} )
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR} )
# Install helper scripts
INSTALL(PROGRAMS
helpers/rosegarden-lilypondview
helpers/rosegarden-project-package
helpers/rosegarden-audiofile-importer
- DESTINATION ${KDE3EXECDIR} )
+ DESTINATION ${BIN_INSTALL_DIR} )
# Install GUI resource files
FILE(GLOB RC_FILES gui/ui/*.rc)
INSTALL(FILES ${RC_FILES}
- DESTINATION ${KDE3DATADIR}/rosegarden )
+ DESTINATION ${DATA_INSTALL_DIR}/rosegarden )
IF(WANT_TEST)
INCLUDE(TestFileList.txt)
@@ -165,7 +165,7 @@
# base/test/segmenttransposecommand.cpp
)
- KDE3_ADD_EXECUTABLE(RosegardenTestDriver
+ KDE4_ADD_EXECUTABLE(RosegardenTestDriver
RosegardenTestDriver.cpp
${tests_SRCS}
)
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (revision 9144)
+++ CMakeLists.txt (working copy)
@@ -86,40 +86,42 @@
ADD_DEFINITIONS(-DNO_SOUND)
ENDIF(NOT WANT_SOUND)
-# Save the flags before FindKDE3
+# Save the flags before FindKDE4
SET(SAVED_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-# Check for KDE3
-FIND_PACKAGE(KDE3 REQUIRED QUIET)
+# Check for KDE4
+FIND_PACKAGE(KDE4 REQUIRED QUIET)
IF(QT_FOUND)
ADD_DEFINITIONS(${QT_DEFINITIONS})
- MESSAGE(STATUS "Found Qt3 (version ${qt_version_str})")
- #MESSAGE("QT_LIBRARIES: ${QT_LIBRARIES}")
+ INCLUDE(${QT_USE_FILE})
+ MESSAGE(STATUS "Found Qt4 (version ${qt_version_str})")
+ MESSAGE("QT_LIBRARIES: ${QT_LIBRARIES}")
+ MESSAGE("QT_INCLUDE_DIR : ${QT_INCLUDE_DIR}")
ELSE(QT_FOUND)
- MESSAGE(FATAL_ERROR "Qt3 package not found")
+ MESSAGE(FATAL_ERROR "Qt4 package not found")
ENDIF(QT_FOUND)
-IF(KDE3_FOUND)
- ADD_DEFINITIONS(${KDE3_DEFINITIONS})
- #MESSAGE("KDE3PREFIX: ${KDE3PREFIX}")
- KDE3_PRINT_RESULTS()
+IF(KDE4_FOUND)
+ ADD_DEFINITIONS(${KDE4_DEFINITIONS})
+ #MESSAGE("KDE4PREFIX: ${KDE4PREFIX}")
+ KDE4_PRINT_RESULTS()
#MESSAGE("QT_AND_KDECORE_LIBS: ${QT_AND_KDECORE_LIBS}")
-ELSE(KDE3_FOUND)
- MESSAGE(FATAL_ERROR "KDE3 Not found")
-ENDIF(KDE3_FOUND)
+ELSE(KDE4_FOUND)
+ MESSAGE(FATAL_ERROR "KDE4 Not found")
+ENDIF(KDE4_FOUND)
-# Restore the flags saved before FindKDE3
+# Restore the flags saved before FindKDE4
SET(CMAKE_CXX_FLAGS ${SAVED_CXX_FLAGS})
-MARK_AS_ADVANCED(KDE3_BUILD_TESTS
- KDE3_ENABLE_FINAL
- KDE3_DCOPIDL_EXECUTABLE
- KDE3_DCOPIDL2CPP_EXECUTABLE
- KDE3_INCLUDE_DIR
- KDE3_KCFGC_EXECUTABLE
- KDE3_KDECORE_LIBRARY
- KDECONFIG_EXECUTABLE )
+MARK_AS_ADVANCED(KDE4_BUILD_TESTS
+ KDE4_ENABLE_FINAL
+ KDE4_DCOPIDL_EXECUTABLE
+ KDE4_DCOPIDL2CPP_EXECUTABLE
+ KDE4_INCLUDE_DIR
+ KDE4_KCFGC_EXECUTABLE
+ KDE4_KDECORE_LIBRARY
+ KDE4_KDE4_KDECONFIG_EXECUTABLE )
-# Provide the KDE3 prefix as a default prefix (if the user has CMake 2.4.4)
+# Provide the KDE4 prefix as a default prefix (if the user has CMake 2.4.4)
IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- SET(CMAKE_INSTALL_PREFIX ${KDE3PREFIX} CACHE PATH
+ SET(CMAKE_INSTALL_PREFIX ${KDE4PREFIX} CACHE PATH
"Install path prefix, prepended onto install directories." FORCE)
ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
@@ -265,10 +267,10 @@
ENDIF(MSGFMT_FOUND)
FIND_PACKAGE(KDECONFIG)
-IF(KDECONFIG_EXECUTABLE)
- MESSAGE(STATUS "Program kde-config found (${KDECONFIG_EXECUTABLE})")
- #MESSAGE("KDE3PREFIX: ${KDE3PREFIX}")
-ENDIF(KDECONFIG_EXECUTABLE)
+IF(KDE4_KDECONFIG_EXECUTABLE)
+ MESSAGE(STATUS "Program kde-config found (${KDE4_KDECONFIG_EXECUTABLE})")
+ #MESSAGE("KDE4PREFIX: ${KDE4PREFIX}")
+ENDIF(KDE4_KDECONFIG_EXECUTABLE)
FIND_PACKAGE(MEINPROC REQUIRED)
IF(MEINPROC_FOUND)
@@ -348,7 +350,7 @@
# create and install the version file
FILE(WRITE version.txt "${VERSION}\n")
INSTALL( FILES version.txt
- DESTINATION ${KDE3DATADIR}/rosegarden )
+ DESTINATION ${KDE4DATADIR}/rosegarden )
# uninstall custom target
CONFIGURE_FILE(
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Rosegarden-devel mailing list
[email protected] - use the link below to unsubscribe
https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
