diff --git a/CMakeLists.txt b/CMakeLists.txt index a12860f..f02200e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,42 +1,43 @@ cmake_minimum_required (VERSION 3.0) project (kdeutils) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) find_package(KDE1 REQUIRED) #find_package(uulib REQUIRED) add_definitions(-DHAVE_CONFIG_H) include_directories(common) include(CMakePackageConfigHelpers) +include(Qt1Macros) include(KDE1Macros) include(KDE1InstallDirs) 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() #add_subdirectory(kfontmanager) #add_subdirectory(kedit) #add_subdirectory(klipper) #add_subdirectory(karm) #add_subdirectory(khexdit) #add_subdirectory(klpq) add_subdirectory(ktop) #add_subdirectory(kjots) #add_subdirectory(kab) #add_subdirectory(ark) add_subdirectory(kcalc) #add_subdirectory(kpm) #add_subdirectory(kljettool) #add_subdirectory(knotes) add_subdirectory(kwrite) add_subdirectory(kfloppy) #add_subdirectory(po) diff --git a/kcalc/CMakeLists.txt b/kcalc/CMakeLists.txt index 26c172d..fcc7b1d 100644 --- a/kcalc/CMakeLists.txt +++ b/kcalc/CMakeLists.txt @@ -1,29 +1,28 @@ include_directories( - ${QT_INCLUDE_DIR} ${KDE1_INCLUDE_DIR} ) set(KCALC_SRCS kcalc.cpp kcalc_core.cpp configdlg.cpp fontdlg.cpp dlabel.cpp stats.cpp ) set(KCALC_MOC kcalc.moc configdlg.moc fontdlg.moc dlabel.moc ) QT1_WRAP_MOC(MOC_FILES ${KCALC_MOC}) add_executable(kcalc ${KCALC_SRCS} ${MOC_FILES}) target_link_libraries(kcalc - ${QT_LIBRARIES} + Qt::Qt1 ${X11_LIBRARIES} ${KDE1_KDECORE} ${KDE1_KDEUI} ) install(TARGETS kcalc RUNTIME DESTINATION ${KDE1_BINDIR}) install(FILES kcalc.kdelnk DESTINATION ${KDE1_DATADIR}/kcalc) install_icon(kcalc.xpm "${KDE1_DATADIR}/kcalc") install_icon(kcalclogo.xpm "${KDE1_DATADIR}/kcalc") diff --git a/kfloppy/CMakeLists.txt b/kfloppy/CMakeLists.txt index 0f5f0ee..ca4e39a 100644 --- a/kfloppy/CMakeLists.txt +++ b/kfloppy/CMakeLists.txt @@ -1,47 +1,46 @@ # FIXME: at least use `uname -r` #set(KERNEL_INCLUDE_DIR /usr/src/kernels/4.8.3-300.fc25.x86_64) include_directories( - ${QT_INCLUDE_DIR} ${KDE1_INCLUDE_DIR} # ${KERNEL_INCLUDE_DIR}/include # ${KERNEL_INCLUDE_DIR}/arch/x86/include/ ) set(KFLOPPY_SRCS main.cpp about.cpp floppy.cpp mount.c ) set(KFLOPPY_MOC about.moc floppy.moc ) QT1_WRAP_MOC(KFLOPPY_MOC_FILES ${KFLOPPY_MOC}) add_executable(kfloppy ${KFLOPPY_SRCS} ${KFLOPPY_MOC_FILES}) target_link_libraries(kfloppy - ${QT_LIBRARIES} + Qt::Qt1 ${X11_LIBRARIES} ${KDE1_KDECORE} ${KDE1_KDEUI} ) install(TARGETS kfloppy RUNTIME DESTINATION ${KDE1_BINDIR}) install(FILES KFloppy.kdelnk DESTINATION ${KDE1_DATADIR}/kfloppy) install_icon(kfloppy.xpm "${KDE1_DATADIR}/kfloppy") install_icon(kfloppylogo.xpm "${KDE1_DATADIR}/kfloppy") ######################### Next target ######################## #set(KMKDOSFS_SRCS kmkdosfs.c) #add_executable(kmkdosfs ${KMKDOSFS_SRCS}) ######################## Next target ######################## #set(KFDFORMAT_SRCS kfdformat.c) #add_executable(kfdformat ${KFDFORMAT_SRCS}) diff --git a/ktop/CMakeLists.txt b/ktop/CMakeLists.txt index 9403bbc..79ffd08 100644 --- a/ktop/CMakeLists.txt +++ b/ktop/CMakeLists.txt @@ -1,34 +1,33 @@ include_directories( - ${QT_INCLUDE_DIR} ${KDE1_INCLUDE_DIR} ) add_definitions(-Dlinux) set(KTOP_SRCS ktop.cpp MainMenu.cpp ProcessMenu.cpp TaskMan.cpp ProcListPage.cpp IconList.cpp ProcessList.cpp OSProcessList.cpp OSProcess.cpp PerfMonPage.cpp FancyPlotter.cpp MultiMeter.cpp SignalPlotter.cpp OSStatus.cpp ReniceDlg.cpp ) set(KTOP_MOC ktop.moc MainMenu.moc ProcessMenu.moc TaskMan.moc ProcListPage.moc ProcessList.moc PerfMonPage.moc FancyPlotter.moc MultiMeter.moc SignalPlotter.moc ReniceDlg.moc ) QT1_WRAP_MOC(MOC_FILES ${KTOP_MOC}) add_executable(ktop ${KTOP_SRCS} ${MOC_FILES}) target_link_libraries(ktop - ${QT_LIBRARIES} + Qt::Qt1 ${X11_LIBRARIES} ${KDE1_KDECORE} ${KDE1_KDEUI} ${KDE1_KFM} ) install(TARGETS ktop RUNTIME DESTINATION ${KDE1_BINDIR}) install(FILES ktop.kdelnk DESTINATION ${KDE1_DATADIR}/ktop) install_icon(ktop.xpm "${KDE1_DATADIR}/ktop") diff --git a/kwrite/CMakeLists.txt b/kwrite/CMakeLists.txt index 2c0f547..b0275fc 100644 --- a/kwrite/CMakeLists.txt +++ b/kwrite/CMakeLists.txt @@ -1,32 +1,31 @@ include_directories( - ${QT_INCLUDE_DIR} ${KDE1_INCLUDE_DIR} ) set(KWRITE_SRCS highlight.cpp kmimemagic.cpp kwdialog.cpp kwdoc.cpp kwview.cpp toplevel.cpp ) set(KWRITE_MOC highlight.moc kmimemagic.moc kwdialog.moc kwdoc.moc kwview.moc toplevel.moc ) QT1_WRAP_MOC(MOC_FILES ${KWRITE_MOC}) add_executable(kwrite ${KWRITE_SRCS} ${MOC_FILES}) target_link_libraries(kwrite - ${QT_LIBRARIES} + Qt::Qt1 ${X11_LIBRARIES} ${KDE1_KDECORE} ${KDE1_KDEUI} ${KDE1_KFM} ${KDE1_KFILE} ) install(TARGETS kwrite RUNTIME DESTINATION ${KDE1_BINDIR}) install(FILES kwrite.kdelnk DESTINATION ${KDE1_DATADIR}/kwrite) install_icon(kwrite.xpm "${KDE1_DATADIR}/kwrite") install_icon(redo.xpm "${KDE1_DATADIR}/kwrite") install_icon(undo.xpm "${KDE1_DATADIR}/kwrite")