From 2a40a2e61871e0751ba9a8b9716e7ae07f04695a Mon Sep 17 00:00:00 2001 From: Volker Lanz Date: Fri, 9 Jan 2009 10:11:36 +0000 Subject: [PATCH] SVN_SILENT: Use lowercase for cmake commands. Looks a lot nicer. svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=908106 --- CMakeLists.txt | 48 ++++++++++++++++---------------- src/CMakeLists.txt | 52 +++++++++++++++++------------------ src/kpart/test/CMakeLists.txt | 14 +++++----- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c2b835e..d306dac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,41 +15,41 @@ # Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -PROJECT(partitionmanager) +project(partitionmanager) -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") -SET(CMAKE_USE_RELATIVE_PATHS OFF) -SET(CMAKE_BUILD_WITH_INSTALL_RPATH ON) +set(CMAKE_USE_RELATIVE_PATHS OFF) +set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) -SET(VERSION_MAJOR "1") -SET(VERSION_MINOR "0") -SET(VERSION_RELEASE "0") -SET(VERSION_SUFFIX "-ALPHA2") -SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}${VERSION_SUFFIX}) -ADD_DEFINITIONS(-D'VERSION="${VERSION}"') +set(VERSION_MAJOR "1") +set(VERSION_MINOR "0") +set(VERSION_RELEASE "0") +set(VERSION_SUFFIX "-ALPHA2") +set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}${VERSION_SUFFIX}) +add_definitions(-D'VERSION="${VERSION}"') -FIND_PACKAGE(KDE4 REQUIRED) +find_package(KDE4 REQUIRED) -FIND_PACKAGE(MSGFMT REQUIRED) -FIND_PACKAGE(PkgConfig REQUIRED) -PKG_CHECK_MODULES(UUID REQUIRED uuid) -PKG_CHECK_MODULES(BLKID REQUIRED blkid) -FIND_PACKAGE(LIBPARTED REQUIRED) +find_package(MSGFMT REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(UUID REQUIRED uuid) +pkg_check_modules(BLKID REQUIRED blkid) +find_package(LIBPARTED REQUIRED) -ADD_DEFINITIONS(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) -ADD_DEFINITIONS(${KDE4_ENABLE_EXCEPTIONS}) +add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) +add_definitions(${KDE4_ENABLE_EXCEPTIONS}) -INCLUDE(KDE4Defaults) -INCLUDE(MacroLibrary) +include(KDE4Defaults) +include(MacroLibrary) -INCLUDE_DIRECTORIES(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${UUID_INCLUDE_DIRS} ${BLKID_INCLUDE_DIRS} src/) +include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${UUID_INCLUDE_DIRS} ${BLKID_INCLUDE_DIRS} src/) -ADD_SUBDIRECTORY(src) +add_subdirectory(src) -MESSAGE(STATUS "KDE Partition Manager ${VERSION} will be built for install into ${CMAKE_INSTALL_PREFIX}") +message(STATUS "KDE Partition Manager ${VERSION} will be built for install into ${CMAKE_INSTALL_PREFIX}") -ADD_CUSTOM_TARGET(docs +add_custom_target(docs COMMAND doxygen Doxyfile WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c71e142..645c747 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,7 +17,7 @@ ############################################ -FILE(GLOB partitionmanagerprivate_SRCS +file(GLOB partitionmanagerprivate_SRCS core/*.cpp util/*.cpp ops/*.cpp @@ -26,54 +26,54 @@ FILE(GLOB partitionmanagerprivate_SRCS gui/*.cpp ) -FILE(GLOB partitionmanagerprivate_UIFILES gui/*.ui) +file(GLOB partitionmanagerprivate_UIFILES gui/*.ui) -KDE4_ADD_UI_FILES(partitionmanagerprivate_SRCS ${partitionmanagerprivate_UIFILES}) +kde4_add_ui_files(partitionmanagerprivate_SRCS ${partitionmanagerprivate_UIFILES}) -KDE4_ADD_KCFG_FILES(partitionmanagerprivate_SRCS config.kcfgc) +kde4_add_kcfg_files(partitionmanagerprivate_SRCS config.kcfgc) -KDE4_ADD_LIBRARY(partitionmanagerprivate SHARED ${partitionmanagerprivate_SRCS}) +kde4_add_library(partitionmanagerprivate SHARED ${partitionmanagerprivate_SRCS}) -TARGET_LINK_LIBRARIES(partitionmanagerprivate ${KDE4_KDECORE_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${LIBPARTED_LIBS} ${UUID_LIBRARIES} ${BLKID_LIBRARIES}) +target_link_libraries(partitionmanagerprivate ${KDE4_KDECORE_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${LIBPARTED_LIBS} ${UUID_LIBRARIES} ${BLKID_LIBRARIES}) -INSTALL(TARGETS partitionmanagerprivate DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS partitionmanagerprivate DESTINATION ${LIB_INSTALL_DIR}) ############################################ -FILE(GLOB partitionmanager_SRCS main.cpp) +file(GLOB partitionmanager_SRCS main.cpp) -KDE4_ADD_EXECUTABLE(partitionmanager ${partitionmanager_SRCS}) +kde4_add_executable(partitionmanager ${partitionmanager_SRCS}) -TARGET_LINK_LIBRARIES(partitionmanager partitionmanagerprivate) +target_link_libraries(partitionmanager partitionmanagerprivate) -INSTALL(TARGETS partitionmanager DESTINATION ${BIN_INSTALL_DIR}) -INSTALL(FILES gui/partitionmanagerui.rc DESTINATION ${DATA_INSTALL_DIR}/partitionmanager) -INSTALL(FILES partitionmanager.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install(TARGETS partitionmanager DESTINATION ${BIN_INSTALL_DIR}) +install(FILES gui/partitionmanagerui.rc DESTINATION ${DATA_INSTALL_DIR}/partitionmanager) +install(FILES partitionmanager.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) ############################################ -OPTION(PARTMAN_KPART "Build a kpart for KDE Partition Manager" OFF) +option(PARTMAN_KPART "Build a kpart for KDE Partition Manager" OFF) -IF(PARTMAN_KPART) - FILE(GLOB partitionmanagerpart_SRCS kpart/partitionmanagerpart.cpp) +if(PARTMAN_KPART) + file(GLOB partitionmanagerpart_SRCS kpart/partitionmanagerpart.cpp) - KDE4_ADD_PLUGIN(partitionmanagerpart ${partitionmanagerpart_SRCS}) + kde4_add_plugin(partitionmanagerpart ${partitionmanagerpart_SRCS}) - TARGET_LINK_LIBRARIES(partitionmanagerpart + target_link_libraries(partitionmanagerpart ${KDE4_KPARTS_LIBS} ${KDE4_KDECORE_LIBS} partitionmanagerprivate ) - INSTALL(TARGETS partitionmanagerpart DESTINATION ${PLUGIN_INSTALL_DIR}) - INSTALL(FILES kpart/partitionmanagerpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}) - INSTALL(FILES kpart/partitionmanagerpart.rc DESTINATION ${DATA_INSTALL_DIR}/partitionmanagerpart) + install(TARGETS partitionmanagerpart DESTINATION ${PLUGIN_INSTALL_DIR}) + install(FILES kpart/partitionmanagerpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + install(FILES kpart/partitionmanagerpart.rc DESTINATION ${DATA_INSTALL_DIR}/partitionmanagerpart) - OPTION(PARTMAN_KPART_TEST "Build a kpart test application for KDE Partition Manager" OFF) + option(PARTMAN_KPART_TEST "Build a kpart test application for KDE Partition Manager" OFF) - IF(PARTMAN_KPART_TEST) - ADD_SUBDIRECTORY(kpart/test) - ENDIF(PARTMAN_KPART_TEST) + if(PARTMAN_KPART_TEST) + add_subdirectory(kpart/test) + endif(PARTMAN_KPART_TEST) -ENDIF(PARTMAN_KPART) +endif(PARTMAN_KPART) diff --git a/src/kpart/test/CMakeLists.txt b/src/kpart/test/CMakeLists.txt index 196548e..65f752d 100644 --- a/src/kpart/test/CMakeLists.txt +++ b/src/kpart/test/CMakeLists.txt @@ -15,18 +15,18 @@ # Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -FIND_PACKAGE(KDE4 REQUIRED) +find_package(KDE4 REQUIRED) -INCLUDE_DIRECTORIES(${KDE4_INCLUDES} .) +include_directories(${KDE4_INCLUDES} .) -SET(kparttest_SRCS +set(kparttest_SRCS main.cpp kparttest.cpp ) -KDE4_ADD_EXECUTABLE(kparttest ${kparttest_SRCS}) +kde4_add_executable(kparttest ${kparttest_SRCS}) -TARGET_LINK_LIBRARIES(kparttest ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS}) +target_link_libraries(kparttest ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS}) -INSTALL(TARGETS kparttest DESTINATION ${BIN_INSTALL_DIR}) -INSTALL(FILES kparttestui.rc DESTINATION ${DATA_INSTALL_DIR}/kparttest) +install(TARGETS kparttest DESTINATION ${BIN_INSTALL_DIR}) +install(FILES kparttestui.rc DESTINATION ${DATA_INSTALL_DIR}/kparttest)