TDE
/
rosegarden
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/rosegarden
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix FTBFS

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 9b6d0553a0
commit 1461610fb3
7 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File

11
ConfigureChecks.cmake
Unescape View File

@ -144,17 +144,6 @@ IF(WANT_LIRC)
ENDIF(LIRC_FOUND) ENDIF(LIRC_FOUND)
ENDIF(WANT_LIRC) ENDIF(WANT_LIRC)
FIND_PACKAGE(KDECONFIG)
IF(KDECONFIG_EXECUTABLE)
MESSAGE(STATUS "Program kde-config found (${KDECONFIG_EXECUTABLE})")
#MESSAGE("KDE3PREFIX: ${KDE3PREFIX}")
ENDIF(KDECONFIG_EXECUTABLE)
FIND_PACKAGE(MEINPROC REQUIRED)
IF(MEINPROC_FOUND)
MESSAGE(STATUS "Program meinproc found (${MEINPROC_EXECUTABLE})")
ENDIF(MEINPROC_FOUND)
# Check GCC for PCH support # Check GCC for PCH support
SET(USE_PCH FALSE) SET(USE_PCH FALSE)
IF(WANT_PCH) IF(WANT_PCH)

2
admin

@ -1 +1 @@
Subproject commit 26d642b2620397b76d5fbb64a9ef5ca8f2334f72 Subproject commit 21cb4a9d2a0e083b10dee6d22958c4f58de6c5b2

2
doc/en/CMakeLists.txt
Unescape View File

@ -9,4 +9,4 @@
# #
################################################# #################################################
tde_create_handbook( DESTINATION rosegarden ) tde_create_handbook( LANG en DESTINATION rosegarden )

2
doc/es/CMakeLists.txt
Unescape View File

@ -9,4 +9,4 @@
# #
################################################# #################################################
tde_create_handbook( DESTINATION rosegarden ) tde_create_handbook( LANG es DESTINATION rosegarden )

2
doc/ja/CMakeLists.txt
Unescape View File

@ -9,4 +9,4 @@
# #
################################################# #################################################
tde_create_handbook( DESTINATION rosegarden ) tde_create_handbook( LANG ja DESTINATION rosegarden )

2
doc/sv/CMakeLists.txt
Unescape View File

@ -9,4 +9,4 @@
# #
################################################# #################################################
tde_create_handbook( DESTINATION rosegarden ) tde_create_handbook( LANG sv DESTINATION rosegarden )

14
src/CMakeLists.txt
Unescape View File

@ -72,7 +72,7 @@ install( FILES ${RC_FILES} DESTINATION ${DATA_INSTALL_DIR}/rosegarden )
##### RosegardenCommon ############################## ##### RosegardenCommon ##############################
tde_add_library( RosegardenCommon STATIC AUTOMOC tde_add_library( RosegardenCommon STATIC AUTOMOC
SOURCES ${${misc_SRCS} ${base_SRCS} ${common_sound_SRCS}} SOURCES ${misc_SRCS} ${base_SRCS} ${common_sound_SRCS}
LINK dl LINK dl
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )
@ -87,7 +87,7 @@ else( WANT_SOUND )
endif( WANT_SOUND ) endif( WANT_SOUND )
tde_add_executable( rosegardensequencer AUTOMOC tde_add_executable( rosegardensequencer AUTOMOC
SOURCES ${${seq_dcop_SRCS} ${snd_SRCS} ${sequencer_SRCS}} SOURCES ${seq_dcop_SRCS} ${snd_SRCS} ${sequencer_SRCS}
LINK dl tdecore-shared ${ALSA_LIBS} ${JACK_LIBS} ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} tdeui-shared RosegardenCommon LINK dl tdecore-shared ${ALSA_LIBS} ${JACK_LIBS} ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} tdeui-shared RosegardenCommon
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )
@ -96,7 +96,7 @@ tde_add_executable( rosegardensequencer AUTOMOC
##### RosegardenExtended ############################ ##### RosegardenExtended ############################
tde_add_library( RosegardenExtended STATIC AUTOMOC tde_add_library( RosegardenExtended STATIC AUTOMOC
SOURCES ${${document_SRCS} ${gui_SRCS} ${gui_dcop_SRCS} ${ui_SRCS}} SOURCES ${document_SRCS} ${gui_SRCS} ${gui_dcop_SRCS} ${ui_SRCS}
LINK dl lo LINK dl lo
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )
@ -105,7 +105,7 @@ tde_add_library( RosegardenExtended STATIC AUTOMOC
##### RosegardenCommands ############################ ##### RosegardenCommands ############################
tde_add_library( RosegardenCommands STATIC AUTOMOC tde_add_library( RosegardenCommands STATIC AUTOMOC
SOURCES ${${commands_SRCS}} SOURCES ${commands_SRCS}
# LINK dl # LINK dl
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )
@ -114,7 +114,7 @@ tde_add_library( RosegardenCommands STATIC AUTOMOC
##### RosegardenSegmentCanvas ####################### ##### RosegardenSegmentCanvas #######################
tde_add_library( RosegardenSegmentCanvas STATIC AUTOMOC tde_add_library( RosegardenSegmentCanvas STATIC AUTOMOC
SOURCES ${${segmentcanvas_SRCS}} SOURCES ${segmentcanvas_SRCS}
# LINK dl # LINK dl
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )
@ -123,7 +123,7 @@ tde_add_library( RosegardenSegmentCanvas STATIC AUTOMOC
##### rosegarden #################################### ##### rosegarden ####################################
tde_add_executable( rosegarden AUTOMOC tde_add_executable( rosegarden AUTOMOC
SOURCES ${gui/application/main.cpp} SOURCES gui/application/main.cpp
LINK dl lo tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} kio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon LINK dl lo tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} kio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )
@ -139,7 +139,7 @@ if( WANT_TEST )
) )
tde_add_executable( RosegardenTestDriver AUTOMOC tde_add_executable( RosegardenTestDriver AUTOMOC
SOURCES ${RosegardenTestDriver.cpp ${tests_SRCS}} SOURCES RosegardenTestDriver.cpp ${tests_SRCS}
LINK dl lo tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} kio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon LINK dl lo tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} kio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

Write Preview
Loading…
Cancel
Save