diff --git a/CMakeLists.txt b/CMakeLists.txt index 17e3ac63..0ed1e0df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,59 +1,59 @@ cmake_minimum_required (VERSION 3.0) project (kdelibs) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) if (NOT CMAKE_BUILD_TYPE) # set(CMAKE_BUILD_TYPE Release) endif() # additional cmake files list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") find_package(PNG REQUIRED) find_package(JPEG REQUIRED) find_package(TIFF REQUIRED) find_package(X11 REQUIRED) find_package(Qt1 REQUIRED) find_package(Gettext REQUIRED) include(CMakePackageConfigHelpers) +include(Qt1Macros) include(KDE1Macros) include(KDE1InstallDirs) set(KDELIBS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") include_directories(common) add_definitions( -DHAVE_CONFIG_H ) if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-write-strings") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -std=c++98") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") endif() install(FILES cmake/FindKDE1.cmake - cmake/FindQt1.cmake cmake/KDE1Macros.cmake cmake/KDE1InstallDirs.cmake cmake/KDE1Macros.cmake cmake/Qt1Macros.cmake DESTINATION ${CMAKE_ROOT}/Modules) add_subdirectory(doc) add_subdirectory(kdecore) add_subdirectory(kdeui) add_subdirectory(kfile) add_subdirectory(kfmlib) add_subdirectory(jscript) add_subdirectory(kimgio) add_subdirectory(khtmlw) add_subdirectory(mediatool) add_subdirectory(kspell) add_subdirectory(kab) add_subdirectory(toolbar) add_subdirectory(po) diff --git a/cmake/FindQt1.cmake b/cmake/FindQt1.cmake deleted file mode 100644 index 9dee63f3..00000000 --- a/cmake/FindQt1.cmake +++ /dev/null @@ -1,42 +0,0 @@ -#============================================================================= -# Copyright 2016 Helio Chissini de Castro -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -set(QT1_FOUND 0) - -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") - -include(Qt1Macros) - -if(UNIX) - find_path(QT_INCLUDE_DIR qapp.h - /opt/qt1/include - /opt/qt1/include/qt - ${QT1_INCLUDE_DIR} - ) - - find_library(QT_LIBRARIES qt - /opt/qt1/lib64 - ${QT1_LIBRARY_DIR} - ) - -endif() - -# handle the QUIETLY and REQUIRED arguments and set MOTIF_FOUND to TRUE if -# all listed variables are TRUE -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt1 DEFAULT_MSG QT_LIBRARIES QT_INCLUDE_DIR) - -mark_as_advanced( - QT_INCLUDE_DIR - QT_LIBRARIES -) diff --git a/cmake/Qt1Macros.cmake b/cmake/Qt1Macros.cmake index 6e1c2fe0..e356622d 100644 --- a/cmake/Qt1Macros.cmake +++ b/cmake/Qt1Macros.cmake @@ -1,95 +1,95 @@ # # This file is included by FindQt1.cmake, don't include it directly. #============================================================================= # Copyright 2005-2009 Kitware, Inc. # Copyright 2016 Helio Chissini de Castro # # Distributed under the OSI-approved BSD License (the "License"); # see accompanying file Copyright.txt for details. # # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. #============================================================================= ###################################### # # Macros for building Qt files # ###################################### macro (QT1_EXTRACT_OPTIONS _qt1_files _qt1_options _qt1_target) set(${_qt1_files}) set(${_qt1_options}) set(_QT1_DOING_OPTIONS FALSE) set(_QT1_DOING_TARGET FALSE) foreach(_currentArg ${ARGN}) if ("x${_currentArg}" STREQUAL "xOPTIONS") set(_QT1_DOING_OPTIONS TRUE) elseif ("x${_currentArg}" STREQUAL "xTARGET") set(_QT1_DOING_TARGET TRUE) else () if(_QT1_DOING_TARGET) set(${_qt1_target} "${_currentArg}") elseif(_QT1_DOING_OPTIONS) list(APPEND ${_qt1_options} "${_currentArg}") else() list(APPEND ${_qt1_files} "${_currentArg}") endif() endif () endforeach() endmacro () macro (QT1_WRAP_HEADER outfiles ) QT1_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN}) foreach (it ${ui_files}) get_filename_component(outfile ${it} NAME_WE) set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${outfile}.h) set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfile}.moc) add_custom_command(OUTPUT ${outfile} - COMMAND /opt/qt1/bin/moc + COMMAND moc-qt1 ARGS ${infile} -o ${outfile} MAIN_DEPENDENCY ${infile} VERBATIM) list(APPEND ${outfiles} ${outfile}) endforeach () endmacro () macro (QT1_WRAP_MOC outfiles ) QT1_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN}) foreach (it ${ui_files}) get_filename_component(filename ${it} NAME_WE) set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${filename}.moc) set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.h) add_custom_command(OUTPUT ${outfile} - COMMAND /opt/qt1/bin/moc + COMMAND moc-qt1 ARGS ${infile} -o ${outfile} MAIN_DEPENDENCY ${infile} VERBATIM) list(APPEND ${outfiles} ${outfile}) endforeach () list(APPEND ${outfiles} ${outfile}) #add_custom_target(moc_ALL ALL DEPENDS ${outfiles}) endmacro () macro (QT1_WRAP_CPP outfiles ) QT1_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN}) foreach (it ${ui_files}) get_filename_component(filename ${it} NAME_WE) set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${filename}.moc.cpp) set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${filename}.h) add_custom_command(OUTPUT ${outfile} - COMMAND /opt/qt1/bin/moc + COMMAND moc-qt1 ARGS ${infile} -o ${outfile} MAIN_DEPENDENCY ${infile} VERBATIM) list(APPEND ${outfiles} ${outfile}) endforeach () list(APPEND ${outfiles} ${outfile}) #add_custom_target(moc_ALL ALL DEPENDS ${outfiles}) endmacro () diff --git a/jscript/CMakeLists.txt b/jscript/CMakeLists.txt index 1c77d5a5..827ca1a9 100644 --- a/jscript/CMakeLists.txt +++ b/jscript/CMakeLists.txt @@ -1,13 +1,9 @@ -include_directories( - ${QT_INCLUDE_DIR} - ) - set(JSCRIPT_SRCS t1.c t2.c cpp2bison.cpp jstree.cpp jsexec.cpp builtin.cpp) add_library(jscript SHARED ${JSCRIPT_SRCS}) set_target_properties(jscript PROPERTIES VERSION 2.0.0 SOVERSION 2) -target_link_libraries(jscript ${QT_LIBRARIES}) +target_link_libraries(jscript Qt::Qt1) install(TARGETS jscript LIBRARY DESTINATION ${KDE1_LIBRARIES}) install(FILES bison2cpp.h jstree.h jsexec.h jserror.h builtin.h DESTINATION ${KDE1_INCLUDES}) diff --git a/kab/CMakeLists.txt b/kab/CMakeLists.txt index 730ac1e4..13e22931 100644 --- a/kab/CMakeLists.txt +++ b/kab/CMakeLists.txt @@ -1,74 +1,73 @@ include_directories( - ${QT_INCLUDE_DIR} ${KDELIBS_SOURCE_DIR}/kdecore ${KDELIBS_SOURCE_DIR}/kdeui ${KDELIBS_SOURCE_DIR}/kfmlib ${KDELIBS_SOURCE_DIR}/kfile ) set(KAB_SRCS kabapi.cc AssertDialog.cpp AssertDialogData.cpp DialogBase.cpp DialogBaseData.cpp PrintDialog.cpp PrintDialogData.cpp SearchDialog.cpp StringListEditWidget.cpp StringListEditWidgetData.cpp StringListEditDialog.cpp addressbook.cc businesscard.cc datepickerdialog.cc editentry.cc searchresults.cc widget.cc configDB.cc sections.cc keyvaluemap.cc functions.cc StringListSelectOneDialog.cpp StringListSelectOneDialogData.cpp StringListSelectSetDialog.cpp StringListSelectAndReorderSet.cpp StringListSelectAndReorderSetData.cpp widgets.cc SearchDialogMainWidget.cpp SearchDialogMainWidgetData.cpp ) set(KAB_MOC AssertDialog.h AssertDialogData.h DialogBase.h DialogBaseData.h PrintDialog.h PrintDialogData.h SearchDialog.h SearchDialogMainWidget.h SearchDialogMainWidgetData.h StringListEditDialog.h StringListEditWidget.h StringListEditWidgetData.h StringListSelectAndReorderSet.h StringListSelectAndReorderSetData.h StringListSelectOneDialog.h StringListSelectOneDialogData.h StringListSelectSetDialog.h businesscard.h datepickerdialog.h editentry.h kab.h kabapi.h searchresults.h ) -QT1_WRAP_HEADER(MOC_FILES ${KAB_MOC}) +qt1_wrap_moc(MOC_FILES ${KAB_MOC}) add_library(kab SHARED ${KAB_SRCS} ${MOC_FILES}) set_target_properties(kab PROPERTIES VERSION 2.0.0 SOVERSION 2) -target_link_libraries(kab kdecore kdeui kfm kfile ${QT_LIBRARIES} ${X11_LIBRARIES}) +target_link_libraries(kab kdecore kdeui kfm kfile Qt::Qt1 ${X11_LIBRARIES}) install(TARGETS kab LIBRARY DESTINATION ${KDE1_LIBRARIES}) install(FILES stl_headers.h kabapi.h kab.h addressbook.h configDB.h keyvaluemap.h sections.h DESTINATION ${KDE1_INCLUDES}) install(FILES dialog_background.jpg background_1.jpg DESTINATION ${KDE1_DATADIR}/kab/pics) diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt index 060c08bd..c083727f 100644 --- a/kdecore/CMakeLists.txt +++ b/kdecore/CMakeLists.txt @@ -1,73 +1,69 @@ -include_directories( - ${QT_INCLUDE_DIR} - ) - set(KDECORE_SRCS kconfig.cpp kconfigbase.cpp ksimpleconfig.cpp kcolorgroup.cpp kapp.cpp kurl.cpp ksock.cpp drag.cpp kprocess.cpp kprocctrl.cpp klocale.cpp libintl.cpp fakes.cpp kiconloader.cpp kdebug.cpp kstdaccel.cpp kwm.cpp krootprop.cpp kcharsets.cpp kcharsetsdata.cpp kchartables.cpp kstring.cpp kpixmap.cpp dither.cpp kckey.cpp kaccel.cpp kglobalaccel.cpp kclipboard.cpp krect.cpp ksize.cpp kpoint.cpp ) set(KDECORE_MOC drag.h kapp.h kclipboard.h kconfig.h kconfigbase.h kdebugdialog.h kglobalaccel.h kiconloader.h kprocctrl.h kprocess.h ksimpleconfig.h ksock.h ) -QT1_WRAP_HEADER(MOC_FILES ${KDECORE_MOC}) +qt1_wrap_moc(MOC_FILES ${KDECORE_MOC}) add_library(kdecore SHARED ${KDECORE_SRCS} ${MOC_FILES}) set_target_properties(kdecore PROPERTIES VERSION 2.0.0 SOVERSION 2) -target_link_libraries(kdecore ${QT_LIBRARIES} ${X11_LIBRARIES}) +target_link_libraries(kdecore Qt::Qt1 ${X11_LIBRARIES}) install(TARGETS kdecore LIBRARY DESTINATION ${KDE1_LIBRARIES}) install(FILES charsets.config DESTINATION ${KDE1_CONFDIR} RENAME "charsets") install(FILES kdebug.areas DESTINATION "${KDE1_CONFDIR}") install(FILES kconfig.h kconfigdata.h ksimpleconfig.h kconfigbase.h kcolorgroup.h kapp.h kcharsets.h kurl.h ksock.h drag.h ckey.h kmisc.h kprocess.h kprocctrl.h klocale.h kiconloader.h kdebug.h kstdaccel.h kwm.h krootprop.h kstring.h kpixmap.h dither.h kaccel.h kglobalaccel.h kckey.h kclipboard.h krect.h ksize.h kpoint.h DESTINATION ${KDE1_INCLUDES}) diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt index 0d90e5a4..00f708aa 100644 --- a/kdeui/CMakeLists.txt +++ b/kdeui/CMakeLists.txt @@ -1,57 +1,57 @@ include_directories( ${QT_INCLUDE_DIR} ${KDELIBS_SOURCE_DIR}/kdecore ${KDELIBS_SOURCE_DIR}/kfile ) set(KDEUI_SRCS kledlamp.cpp kprogress.cpp kpanner.cpp kcolordlg.cpp kselect.cpp kdatepik.cpp kdatetbl.cpp kfontdialog.cpp kmsgbox.cpp kpopmenu.cpp ktabctl.cpp ktreelist.cpp kstatusbar.cpp ktopwidget.cpp ktmainwindow.cpp kmenubar.cpp ktoolbar.cpp kbutton.cpp kslider.cpp kseparator.cpp klined.cpp kcombo.cpp krestrictedline.cpp kintegerline.cpp kspinbox.cpp kcontrol.cpp kcolorbtn.cpp kiconloaderdialog.cpp kwmmapp.cpp kbuttonbox.cpp ktablistbox.cpp knewpanner.cpp keditcl1.cpp keditcl2.cpp ktoolboxmgr.cpp kled.cpp kdbtn.cpp knotebook.cpp ktabbar.cpp kwizard.cpp kcontainer.cpp kkeydialog.cpp kurllabel.cpp kruler.cpp kquickhelp.cpp kcursor.cpp) set(KDEUI_MOC kbutton.h kbuttonbox.h kcolorbtn.h kcolordlg.h kcombo.h kcontainer.h kcontrol.h kdatepik.h kdatetbl.h kdbtn.h keditcl.h kfontdialog.h kiconloaderdialog.h kintegerline.h kkeydialog.h kled.h kledlamp.h klined.h kmenubar.h kmsgbox.h knewpanner.h knotebook.h kpanner.h kpopmenu.h kprogress.h kquickhelp.h krestrictedline.h kruler.h kselect.h kslider.h kspinbox.h kstatusbar.h ktabbar.h ktabctl.h ktablistbox.h ktmainwindow.h ktoolbar.h ktoolboxmgr.h ktopwidget.h ktreelist.h kurllabel.h kwizard.h kwmmapp.h) -QT1_WRAP_HEADER(MOC_FILES ${KDEUI_MOC}) +qt1_wrap_moc(MOC_FILES ${KDEUI_MOC}) add_library(kdeui SHARED ${KDEUI_SRCS} ${MOC_FILES}) set_target_properties(kdeui PROPERTIES VERSION 2.0.0 SOVERSION 2) target_link_libraries(kdeui kdecore ${QT_LIBRARIES} ${X11_LIBRARIES}) install(TARGETS kdeui LIBRARY DESTINATION ${KDE1_LIBRARIES}) install(FILES kledlamp.h kprogress.h kpanner.h kcolordlg.h kselect.h kdatepik.h kdatetbl.h kfontdialog.h kmsgbox.h kpopmenu.h ktabctl.h ktreelist.h kstatusbar.h ktopwidget.h ktmainwindow.h ktoolbar.h kmenubar.h kbutton.h kslider.h kseparator.h klined.h kcombo.h krestrictedline.h kintegerline.h kspinbox.h kcolorbtn.h kiconloaderdialog.h kwmmapp.h kbuttonbox.h ktablistbox.h kcontainer.h knewpanner.h kcontrol.h keditcl.h ktoolboxmgr.h kled.h kdbtn.h knotebook.h ktabbar.h kwizard.h kkeydialog.h kurllabel.h kruler.h kquickhelp.h kcursor.h DESTINATION ${KDE1_INCLUDES}) install(FILES error.xpm exclamation.xpm info.xpm stopsign.xpm question.xpm arrow_up.xbm arrow_down.xbm arrow_left.xbm arrow_right.xbm DESTINATION ${KDE1_DATADIR}/kde/pics) diff --git a/kfile/CMakeLists.txt b/kfile/CMakeLists.txt index a74a3c48..77e73751 100644 --- a/kfile/CMakeLists.txt +++ b/kfile/CMakeLists.txt @@ -1,37 +1,37 @@ include_directories( ${QT_INCLUDE_DIR} ${KDELIBS_SOURCE_DIR}/kdecore ${KDELIBS_SOURCE_DIR}/kdeui ${KDELIBS_SOURCE_DIR}/kfmlib ) set(KFILE_SRCS kfilebookmark.cpp kfiledialogconf.cpp kcombiview.cpp kdir.cpp kfileinfo.cpp kremotefile.cpp kdirlistbox.cpp kfiledetaillist.cpp kfiledialog.cpp booktoken.cpp kfileinfocontents.cpp kfilesimpleview.cpp kpreview.cpp kfilepreview.cpp xview.cpp kfilefilter.cpp ) set(KFILE_MOC kcombiview.h kdir.h kdirlistbox.h kfilebookmark.h kfiledetaillist.h kfiledialog.h kfiledialogconf.h kfilefilter.h kfileinfocontents.h kfilepreview.h kfilesimpleview.h kpreview.h ) -QT1_WRAP_HEADER(MOC_FILES ${KFILE_MOC}) +qt1_wrap_moc(MOC_FILES ${KFILE_MOC}) add_library(kfile SHARED ${KFILE_SRCS} ${MOC_FILES}) set_target_properties(kfile PROPERTIES VERSION 2.0.0 SOVERSION 2) target_link_libraries(kfile kdecore kdeui kfm ${QT_LIBRARIES} ${X11_LIBRARIES}) install(TARGETS kfile LIBRARY DESTINATION ${KDE1_LIBRARIES}) install(FILES kfiledialog.h kfileinfo.h kfilebookmark.h kremotefile.h kdir.h kdirlistbox.h kfileinfocontents.h booktoken.h kfiledetaillist.h kcombiview.h kpreview.h kfilepreview.h xview.h kfilesimpleview.h kfilefilter.h DESTINATION ${KDE1_INCLUDES}) install(FILES configure.xpm DESTINATION ${KDE1_TOOLBARDIR}) diff --git a/kfmlib/CMakeLists.txt b/kfmlib/CMakeLists.txt index b6e3b100..c22306a9 100644 --- a/kfmlib/CMakeLists.txt +++ b/kfmlib/CMakeLists.txt @@ -1,17 +1,17 @@ include_directories( ${QT_INCLUDE_DIR} ${KDELIBS_SOURCE_DIR}/kdecore ) set(KFM_SRCS kfm.cpp kfmclient_ipc.cpp kfmclient_ipc2.cpp kfmipc.cpp) set(KFM_MOC kfm.h kfmclient_ipc.h) -QT1_WRAP_HEADER(MOC_FILES ${KFM_MOC}) +qt1_wrap_moc(MOC_FILES ${KFM_MOC}) add_library(kfm SHARED ${KFM_SRCS} ${MOC_FILES}) set_target_properties(kfm PROPERTIES VERSION 2.0.0 SOVERSION 2) target_link_libraries(kfm kdecore ${QT_LIBRARIES}) install(TARGETS kfm LIBRARY DESTINATION ${KDE1_LIBRARIES}) install(FILES kfm.h kfmclient_ipc.h kfmipc.h DESTINATION ${KDE1_INCLUDES}) diff --git a/khtmlw/CMakeLists.txt b/khtmlw/CMakeLists.txt index 7a92688b..c85865df 100644 --- a/khtmlw/CMakeLists.txt +++ b/khtmlw/CMakeLists.txt @@ -1,32 +1,32 @@ include_directories( ${QT_INCLUDE_DIR} ${KDELIBS_SOURCE_DIR}/kdecore ${KDELIBS_SOURCE_DIR}/kdeui ${KDELIBS_SOURCE_DIR}/jscript ${KDELIBS_SOURCE_DIR}/kimgio ) set(KHTMLW_SRCS jscript.cpp html.cpp htmlobj.cpp htmlfont.cpp htmlform.cpp htmltoken.cpp htmlframe.cpp htmlview.cpp htmlclue.cpp debug.cpp htmldata.cpp htmltable.cpp htmliter.cpp htmlchain.cpp ) set(KHTMLW_MOC html.h htmlform.h htmlframe.h htmlobj.h htmlview.h ) -QT1_WRAP_HEADER(MOC_FILES ${KHTMLW_MOC}) +qt1_wrap_moc(MOC_FILES ${KHTMLW_MOC}) add_library(khtmlw SHARED ${KHTMLW_SRCS} ${MOC_FILES}) set_target_properties(khtmlw PROPERTIES VERSION 2.0.0 SOVERSION 2) target_link_libraries(khtmlw kdecore kdeui jscript kimgio ${QT_LIBRARIES} ${X11_LIBRARIES}) install(TARGETS khtmlw LIBRARY DESTINATION ${KDE1_LIBRARIES}) install(FILES jscript.h html.h htmlobj.h htmlfont.h htmlform.h htmltoken.h htmlframe.h htmlview.h htmlclue.h htmldata.h htmltable.h htmliter.h DESTINATION ${KDE1_INCLUDES}) install(FILES khtmlw_dnd.xpm DESTINATION ${KDE1_DATADIR}/khtmlw/pics ) diff --git a/kimgio/CMakeLists.txt b/kimgio/CMakeLists.txt index 261cebe2..e45f416e 100644 --- a/kimgio/CMakeLists.txt +++ b/kimgio/CMakeLists.txt @@ -1,13 +1,12 @@ include_directories( - ${QT_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ) set(KIMGIO_SRCS jpeg.cpp xview.cpp kimgio.cpp eps.cpp tiffr.cpp pngr.cpp) add_library(kimgio SHARED ${KIMGIO_SRCS}) set_target_properties(kimgio PROPERTIES VERSION 2.0.0 SOVERSION 2) -target_link_libraries(kimgio kdecore ${PNG_LIBRARY} ${JPEG_LIBRARY} ${TIFF_LIBRARY}) +target_link_libraries(kimgio kdecore ${PNG_LIBRARY} ${JPEG_LIBRARY} ${TIFF_LIBRARY} Qt::Qt1) install(TARGETS kimgio LIBRARY DESTINATION ${KDE1_LIBRARIES}) install(FILES kimgio.h DESTINATION ${KDE1_INCLUDES}) diff --git a/kspell/CMakeLists.txt b/kspell/CMakeLists.txt index 485c7ccc..61128ce3 100644 --- a/kspell/CMakeLists.txt +++ b/kspell/CMakeLists.txt @@ -1,17 +1,17 @@ include_directories( ${QT_INCLUDE_DIR} ${KDELIBS_SOURCE_DIR}/kdecore ${KDELIBS_SOURCE_DIR}/kdeui ) set(KSPELL_SRCS kspelldlg.cpp kspell.cpp ksconfig.cpp kprocio.cpp) set(KSPELL_MOC kprocio.h ksconfig.h kspell.h kspelldlg.h) -QT1_WRAP_HEADER(MOC_FILES ${KSPELL_MOC}) +qt1_wrap_moc(MOC_FILES ${KSPELL_MOC}) add_library(kspell SHARED ${KSPELL_SRCS} ${MOC_FILES}) set_target_properties(kspell PROPERTIES VERSION 2.0.0 SOVERSION 2) target_link_libraries(kspell kdecore kdeui ${QT_LIBRARIES} ${X11_LIBRARIES}) install(TARGETS kspell LIBRARY DESTINATION ${KDE1_LIBRARIES}) install(FILES kspell.h ksconfig.h kprocio.h kspelldlg.h DESTINATION ${KDE1_INCLUDES}) diff --git a/mediatool/CMakeLists.txt b/mediatool/CMakeLists.txt index e72dc91f..0167eb35 100644 --- a/mediatool/CMakeLists.txt +++ b/mediatool/CMakeLists.txt @@ -1,21 +1,21 @@ include_directories( ${QT_INCLUDE_DIR} ${KDELIBS_SOURCE_DIR}/kdecore ) set(MEDIATOOL_SRCS chunk.c eventcounter.c connect.c filename.c playlist.c kaudio.cpp ) set(MEDIATOOL_MOC kaudio.h ) -QT1_WRAP_HEADER(MOC_FILES ${MEDIATOOL_MOC}) +qt1_wrap_moc(MOC_FILES ${MEDIATOOL_MOC}) add_library(mediatool SHARED ${MEDIATOOL_SRCS} ${MOC_FILES}) set_target_properties(mediatool PROPERTIES VERSION 2.0.0 SOVERSION 2) target_link_libraries(mediatool kdecore ${QT_LIBRARIES} ${X11_LIBRARIES}) install(TARGETS mediatool LIBRARY DESTINATION ${KDE1_LIBRARIES}) install(FILES mediatool.h kaudio.h DESTINATION ${KDE1_INCLUDES})