alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove predicates on cmake end commands

Browse Source 
http://techbase.kde.org/Policies/CMake_Coding_Style#End_commands
This commit is contained in:
Aleix Pol 2013-11-14 17:25:10 +01:00
parent 19d6fab067
commit 3ef13c53dc
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/declarativeimports/core/CMakeLists.txt
View File

@ -53,7 +53,7 @@ if(X11_FOUND)
if(OPENGL_FOUND) if(OPENGL_FOUND)
target_link_libraries(corebindingsplugin ${OPENGL_gl_LIBRARY}) target_link_libraries(corebindingsplugin ${OPENGL_gl_LIBRARY})
endif() endif()
endif(X11_FOUND) endif()
install(TARGETS corebindingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core) install(TARGETS corebindingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core)
install(FILES qmldir ToolTip.qml DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core) install(FILES qmldir ToolTip.qml DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core)

16
src/plasma/CMakeLists.txt
View File

@ -19,11 +19,11 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
set(PLASMA_NO_PACKAGE_EXTRADATA TRUE) set(PLASMA_NO_PACKAGE_EXTRADATA TRUE)
set(PLASMA_NO_KUTILS TRUE) set(PLASMA_NO_KUTILS TRUE)
set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE) set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE)
endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) endif()
if(NOT X11_FOUND) if(NOT X11_FOUND)
set(PLASMA_NO_PACKAGEKIT TRUE) set(PLASMA_NO_PACKAGEKIT TRUE)
endif(NOT X11_FOUND) endif()
#find_package(KdepimLibs 4.5.60) #find_package(KdepimLibs 4.5.60)
#find_package(Gpgme) #find_package(Gpgme)
@ -33,21 +33,21 @@ endif(NOT X11_FOUND)
if(NOT PLASMA_NO_KIO) if(NOT PLASMA_NO_KIO)
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS}) set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS})
endif(NOT PLASMA_NO_KIO) endif()
if(NOT PLASMA_NO_SOLID) if(NOT PLASMA_NO_SOLID)
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} KF5::Solid) set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} KF5::Solid)
endif(NOT PLASMA_NO_SOLID) endif()
if(NOT PLASMA_NO_PACKAGEKIT) if(NOT PLASMA_NO_PACKAGEKIT)
add_definitions(-DPLASMA_ENABLE_PACKAGEKIT_SUPPORT=1) add_definitions(-DPLASMA_ENABLE_PACKAGEKIT_SUPPORT=1)
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} Qt5::DBus) set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} Qt5::DBus)
endif(NOT PLASMA_NO_PACKAGEKIT) endif()
if (NOT PLASMA_NO_KUTILS) if (NOT PLASMA_NO_KUTILS)
#FIXME: for kcmodule classes; should not be in libplasma if possible #FIXME: for kcmodule classes; should not be in libplasma if possible
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KCMUTILS_LIBS}) set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KCMUTILS_LIBS})
endif(NOT PLASMA_NO_KUTILS) endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-plasma.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-plasma.h) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-plasma.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-plasma.h)
@ -158,11 +158,11 @@ target_link_libraries(Plasma
if(X11_FOUND) if(X11_FOUND)
target_link_libraries(Plasma Qt5::X11Extras ${X11_LIBRARIES}) target_link_libraries(Plasma Qt5::X11Extras ${X11_LIBRARIES})
endif(X11_FOUND) endif()
if(DL_LIBRARY) if(DL_LIBRARY)
target_link_libraries(Plasma ${DL_LIBRARY}) target_link_libraries(Plasma ${DL_LIBRARY})
endif(DL_LIBRARY) endif()
target_link_libraries(Plasma LINK_INTERFACE_LIBRARIES Qt5::Widgets KF5::KConfigWidgets) target_link_libraries(Plasma LINK_INTERFACE_LIBRARIES Qt5::Widgets KF5::KConfigWidgets)
target_include_directories(Plasma PUBLIC target_include_directories(Plasma PUBLIC

6
src/plasma/autotests/CMakeLists.txt
View File

@ -17,7 +17,7 @@ MACRO(PLASMA_UNIT_TESTS)
KF5::KService) KF5::KService)
if(QT_QTOPENGL_FOUND) if(QT_QTOPENGL_FOUND)
target_link_libraries(${_testname} Qt5::OpenGL) target_link_libraries(${_testname} Qt5::OpenGL)
endif(QT_QTOPENGL_FOUND) endif()
add_test(plasma-${_testname} ${_testname}) add_test(plasma-${_testname} ${_testname})
ecm_mark_as_test(${_testname}) ecm_mark_as_test(${_testname})
ENDFOREACH(_testname) ENDFOREACH(_testname)
@ -38,9 +38,9 @@ ecm_mark_as_test(storagetest)
if(QT_QTOPENGL_FOUND) if(QT_QTOPENGL_FOUND)
target_link_libraries(storagetest Qt5::OpenGL) target_link_libraries(storagetest Qt5::OpenGL)
endif(QT_QTOPENGL_FOUND) endif()
if(QCA2_FOUND) if(QCA2_FOUND)
# target_link_libraries(plasmoidpackagetest ${QCA2_LIBRARIES}) # target_link_libraries(plasmoidpackagetest ${QCA2_LIBRARIES})
endif(QCA2_FOUND) endif()

2
src/plasmaquick/autotests/CMakeLists.txt
View File

@ -21,7 +21,7 @@ MACRO(PLASMA_UNIT_TESTS)
) )
if(QT_QTOPENGL_FOUND) if(QT_QTOPENGL_FOUND)
target_link_libraries(${_testname} ${QT_QTOPENGL_LIBRARY}) target_link_libraries(${_testname} ${QT_QTOPENGL_LIBRARY})
endif(QT_QTOPENGL_FOUND) endif()
add_test(plasma-${_testname} ${_testname}) add_test(plasma-${_testname} ${_testname})
ecm_mark_as_test(${_testname}) ecm_mark_as_test(${_testname})
ENDFOREACH(_testname) ENDFOREACH(_testname)

2
src/scriptengines/javascript/CMakeLists.txt
View File

@ -5,7 +5,7 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
set(PLASMA_NO_KNEWSTUFF TRUE) set(PLASMA_NO_KNEWSTUFF TRUE)
set(PLASMA_NO_SOLID TRUE) set(PLASMA_NO_SOLID TRUE)
set(PLASMA_NO_KIO TRUE) set(PLASMA_NO_KIO TRUE)
endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) endif()
set(simple_javascript_engine_SRCS set(simple_javascript_engine_SRCS
common/extension_launchapp.cpp common/extension_launchapp.cpp

2
src/scriptengines/qml/CMakeLists.txt
View File

@ -5,7 +5,7 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
set(PLASMA_NO_KNEWSTUFF TRUE) set(PLASMA_NO_KNEWSTUFF TRUE)
set(PLASMA_NO_SOLID TRUE) set(PLASMA_NO_SOLID TRUE)
set(PLASMA_NO_KIO TRUE) set(PLASMA_NO_KIO TRUE)
endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) endif()
#DECLARATIVE APPLET #DECLARATIVE APPLET
set(declarative_appletscript_SRCS set(declarative_appletscript_SRCS

2
src/shell/CMakeLists.txt
View File

@ -84,7 +84,7 @@ target_include_directories(plasma-shell PRIVATE "${CMAKE_BINARY_DIR}")
if(X11_FOUND) if(X11_FOUND)
target_link_libraries(plasma-shell ${X11_LIBRARIES} ${XCB_XCB_LIBRARY} ) target_link_libraries(plasma-shell ${X11_LIBRARIES} ${XCB_XCB_LIBRARY} )
target_link_libraries(plasma-shell Qt5::X11Extras) target_link_libraries(plasma-shell Qt5::X11Extras)
endif(X11_FOUND) endif()
install(TARGETS plasma-shell ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS plasma-shell ${INSTALL_TARGETS_DEFAULT_ARGS})