diff options
author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-08 15:49:56 +0000 |
---|---|---|
committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-08 15:49:56 +0000 |
commit | 96411d66c8095128af871a82ba2895c61dab3281 (patch) | |
tree | c0cf5c800fd5b6e44c7bf9c05a9f197d8db1e525 | |
parent | 5c3f3c34c2f56660f935451776e76e552c7af305 (diff) | |
download | tdegraphics-96411d66c8095128af871a82ba2895c61dab3281.tar.gz tdegraphics-96411d66c8095128af871a82ba2895c61dab3281.zip |
[kdegraphics] added cmake support for kgamma, kiconedit, and kmrml
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1230898 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r-- | CMakeLists.txt | 8 | ||||
-rw-r--r-- | config.h.cmake | 4 | ||||
-rw-r--r-- | kgamma/CMakeLists.txt | 15 | ||||
-rw-r--r-- | kgamma/ConfigureChecks.cmake | 22 | ||||
-rw-r--r-- | kgamma/kcmkgamma/CMakeLists.txt | 43 | ||||
-rw-r--r-- | kgamma/kcmkgamma/pics/CMakeLists.txt | 18 | ||||
-rw-r--r-- | kgamma/xf86gammacfg/CMakeLists.txt | 27 | ||||
-rw-r--r-- | kiconedit/CMakeLists.txt | 42 | ||||
-rw-r--r-- | kiconedit/pics/CMakeLists.txt | 15 | ||||
-rw-r--r-- | kiconedit/pics/icons/CMakeLists.txt | 12 | ||||
-rw-r--r-- | kiconedit/pics/toolbar/CMakeLists.txt | 20 | ||||
-rw-r--r-- | kmrml/CMakeLists.txt | 14 | ||||
-rw-r--r-- | kmrml/ConfigureChecks.cmake | 13 | ||||
-rw-r--r-- | kmrml/kmrml/CMakeLists.txt | 62 | ||||
-rw-r--r-- | kmrml/kmrml/kcontrol/CMakeLists.txt | 38 | ||||
-rw-r--r-- | kmrml/kmrml/lib/CMakeLists.txt | 26 | ||||
-rw-r--r-- | kmrml/kmrml/server/CMakeLists.txt | 35 |
17 files changed, 413 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 299db935..0b37a8dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,10 @@ option( BUILD_KDVI "Build kdvi" ${BUILD_ALL} ) option( BUILD_KFAX "Build kfax" ${BUILD_ALL} ) option( BUILD_KFAXVIEW "Build kfaxview" ${BUILD_ALL} ) option( BUILD_KFILE_PLUGINS "Build kfile-plugins" ${BUILD_ALL} ) +option( BUILD_KGAMMA "Build kgamma" ${BUILD_ALL} ) option( BUILD_KGHOSTVIEW "Build kghostview" ${BUILD_ALL} ) +option( BUILD_KICONEDIT "Build kiconedit" ${BUILD_ALL} ) +option( BUILD_KMRML "Build kmrml" ${BUILD_ALL} ) option( BUILD_KVIEW "Build kview" ${BUILD_ALL} ) option( BUILD_KRULER "Build kruler" ${BUILD_ALL} ) option( BUILD_KPDF "Build kpdf" ${BUILD_ALL} ) @@ -97,8 +100,11 @@ tde_conditional_add_subdirectory( BUILD_KDVI kdvi ) tde_conditional_add_subdirectory( BUILD_KFAX kfax ) tde_conditional_add_subdirectory( BUILD_KFAXVIEW kfaxview ) tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS kfile-plugins ) -tde_conditional_add_subdirectory( BUILD_KVIEW kview ) +tde_conditional_add_subdirectory( BUILD_KGAMMA kgamma ) tde_conditional_add_subdirectory( BUILD_KGHOSTVIEW kghostview ) +tde_conditional_add_subdirectory( BUILD_KICONEDIT kiconedit ) +tde_conditional_add_subdirectory( BUILD_KMRML kmrml ) +tde_conditional_add_subdirectory( BUILD_KVIEW kview ) tde_conditional_add_subdirectory( BUILD_KRULER kruler ) tde_conditional_add_subdirectory( BUILD_KPDF kpdf ) tde_conditional_add_subdirectory( BUILD_KSVG ksvg ) diff --git a/config.h.cmake b/config.h.cmake index 28bbf5a2..8cf30e77 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -34,3 +34,7 @@ #define HAS_MBSTATE 1 #endif #endif + +// kmrml +#cmakedefine HAVE_STDLIB_H 1 +#cmakedefine HAVE_UNISTD_H 1 diff --git a/kgamma/CMakeLists.txt b/kgamma/CMakeLists.txt new file mode 100644 index 00000000..1a66079a --- /dev/null +++ b/kgamma/CMakeLists.txt @@ -0,0 +1,15 @@ +################################################# +# +# (C) 2010-2011 Calvin Morrison +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include( ConfigureChecks.cmake ) + +add_subdirectory( kcmkgamma ) +add_subdirectory( xf86gammacfg ) diff --git a/kgamma/ConfigureChecks.cmake b/kgamma/ConfigureChecks.cmake new file mode 100644 index 00000000..14815e43 --- /dev/null +++ b/kgamma/ConfigureChecks.cmake @@ -0,0 +1,22 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include( CheckIncludeFileCXX ) + +pkg_search_module( XXF86VM xxf86vm ) +if( NOT XXF86VM_FOUND ) + tde_message_fatal( "xxf86vm is required, but was not found on your system" ) +endif( ) + +tde_save( CMAKE_REQUIRED_INCLUDES ) +set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} ) +check_include_file_cxx( sstream HAVE_SSTREAM ) +tde_restore( CMAKE_REQUIRED_INCLUDES ) diff --git a/kgamma/kcmkgamma/CMakeLists.txt b/kgamma/kcmkgamma/CMakeLists.txt new file mode 100644 index 00000000..6ec0ff8d --- /dev/null +++ b/kgamma/kcmkgamma/CMakeLists.txt @@ -0,0 +1,43 @@ +################################################# +# +# (C) 2010-2011 Calvin Morrison +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( pics ) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +#### other data ################################# + +install( FILES kgamma.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) + + +#### kcmkgamma (module) ######################### + +if( HAVE_SSTREAM ) + set_source_files_properties( xvidextwrap.cpp PROPERTIES COMPILE_FLAGS "-DHAVE_SSTREAM" ) +endif( ) + +tde_add_kpart( kcm_kgamma AUTOMOC + SOURCES + xf86configpath.cpp xvidextwrap.cpp + displaynumber.cpp gammactrl.cpp kgamma.cpp + LINK kparts-shared ${XXF86VM_LIBRARIES} + DESTINATION ${PLUGIN_INSTALL_DIR} +) diff --git a/kgamma/kcmkgamma/pics/CMakeLists.txt b/kgamma/kcmkgamma/pics/CMakeLists.txt new file mode 100644 index 00000000..6d952a51 --- /dev/null +++ b/kgamma/kcmkgamma/pics/CMakeLists.txt @@ -0,0 +1,18 @@ +################################################# +# +# (C) 2010-2011 Calvin Morrison +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_install_icons( kgamma ) + +install( FILES + background.png cmyscale.png darkgrey.png greyscale.png + lightgrey.png midgrey.png rgbscale.png + DESTINATION ${DATA_INSTALL_DIR}/kgamma/pics +) diff --git a/kgamma/xf86gammacfg/CMakeLists.txt b/kgamma/xf86gammacfg/CMakeLists.txt new file mode 100644 index 00000000..60dd67c5 --- /dev/null +++ b/kgamma/xf86gammacfg/CMakeLists.txt @@ -0,0 +1,27 @@ +################################################# +# +# (C) 2010-2011 Calvin Morrison +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_BINARY_DIR} + ${TQT_INCLUDE_DIRS} +) + + +#### xf86gammacfg (executable) ################## + +if( HAVE_SSTREAM ) + set_source_files_properties( xf86gammacfg.cpp PROPERTIES COMPILE_FLAGS "-DHAVE_SSTREAM" ) +endif( ) + +tde_add_executable( xf86gammacfg + SOURCES xf86gammacfg.cpp + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/kiconedit/CMakeLists.txt b/kiconedit/CMakeLists.txt new file mode 100644 index 00000000..0724ce14 --- /dev/null +++ b/kiconedit/CMakeLists.txt @@ -0,0 +1,42 @@ +################################################# +# +# (C) 2010-2011 Calvin Morrison +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory ( pics ) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +#### other data ################################# + +install( FILES kiconedit.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES kiconeditui.rc DESTINATION ${DATA_INSTALL_DIR}/kiconedit ) + + +#### kiconedit (executable) ##################### + +tde_add_executable( kiconedit AUTOMOC + SOURCES + utils.cpp main.cpp kiconedit.cpp kicongrid.cpp + kiconcolors.cpp kcolorgrid.cpp palettetoolbar.cpp + kicon.cpp kresize.cpp knew.cpp properties.cpp + kiconeditslots.cpp kiconconfig.cpp + LINK kio-shared kdeprint-shared + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/kiconedit/pics/CMakeLists.txt b/kiconedit/pics/CMakeLists.txt new file mode 100644 index 00000000..0f0977fb --- /dev/null +++ b/kiconedit/pics/CMakeLists.txt @@ -0,0 +1,15 @@ +################################################# +# +# (C) 2010-2011 Calvin Morrison +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( icons ) +add_subdirectory( toolbar ) + +tde_install_icons( kiconedit ) diff --git a/kiconedit/pics/icons/CMakeLists.txt b/kiconedit/pics/icons/CMakeLists.txt new file mode 100644 index 00000000..04aa1f5d --- /dev/null +++ b/kiconedit/pics/icons/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Calvin Morrison +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +install( FILES source.png standard.png compressed.png DESTINATION ${DATA_INSTALL_DIR}/kiconedit/pics ) diff --git a/kiconedit/pics/toolbar/CMakeLists.txt b/kiconedit/pics/toolbar/CMakeLists.txt new file mode 100644 index 00000000..8d44094b --- /dev/null +++ b/kiconedit/pics/toolbar/CMakeLists.txt @@ -0,0 +1,20 @@ +################################################# +# +# (C) 2010-2011 Calvin Morrison +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +install( FILES + fileclose.png circle.png filledcircle.png line.png + paintbrush-cursor.xpm airbrush-cursor.xpm ellipse.png + filledellipse.png rectangle.png filledrectangle.png areaselect.png + selectrect.png selectcircle.png fill-cursor.xpm grid.png pointer.png + aim.png aim-cursor.xpm window_new.png grayscale.png kdepalette.png + transform.png eraser-cursor.xpm colorpicker-cursor.xpm + DESTINATION ${DATA_INSTALL_DIR}/kiconedit/pics +) diff --git a/kmrml/CMakeLists.txt b/kmrml/CMakeLists.txt new file mode 100644 index 00000000..3401365d --- /dev/null +++ b/kmrml/CMakeLists.txt @@ -0,0 +1,14 @@ +################################################# +# +# (C) 2010-2011 Calvin Morrison +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include( ConfigureChecks.cmake ) + +add_subdirectory ( kmrml ) diff --git a/kmrml/ConfigureChecks.cmake b/kmrml/ConfigureChecks.cmake new file mode 100644 index 00000000..51a3c9fb --- /dev/null +++ b/kmrml/ConfigureChecks.cmake @@ -0,0 +1,13 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +check_include_file( stdlib.h HAVE_STDLIB_H ) +check_include_file( unistd.h HAVE_UNISTD_H ) diff --git a/kmrml/kmrml/CMakeLists.txt b/kmrml/kmrml/CMakeLists.txt new file mode 100644 index 00000000..3d491827 --- /dev/null +++ b/kmrml/kmrml/CMakeLists.txt @@ -0,0 +1,62 @@ +################################################# +# +# (C) 2010-2011 Calvin Morrison +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( lib ) +add_subdirectory( kcontrol ) +add_subdirectory( server ) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/lib + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +#### other data ################################# + +install( FILES mrml.protocol mrml_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES mrml.desktop DESTINATION ${MIME_INSTALL_DIR}/text ) +install( FILES mrml-servicemenu.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus ) + + +#### kio_mrml (module) ########################## + +tde_add_kpart( kio_mrml AUTOMOC + SOURCES mrml.cpp + LINK kmrmlstuff-static kio-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### libkmrmlpart (module) ####################### + +tde_add_kpart( libkmrmlpart AUTOMOC + SOURCES + mrml_part.cpp mrml_view.cpp loader.cpp mrml_elements.cpp + mrml_creator.cpp browser.cpp algorithmdialog.cpp collectioncombo.cpp + algorithmcombo.cpp propertysheet.cpp + LINK kmrmlstuff-static kparts-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### mrmlsearch (kdeinit) ###################### + +tde_add_kdeinit_executable( mrmlsearch AUTOMOC + SOURCES mrmlsearch.cpp + LINK kmrmlstuff-static kdecore-shared +) diff --git a/kmrml/kmrml/kcontrol/CMakeLists.txt b/kmrml/kmrml/kcontrol/CMakeLists.txt new file mode 100644 index 00000000..6db11a40 --- /dev/null +++ b/kmrml/kmrml/kcontrol/CMakeLists.txt @@ -0,0 +1,38 @@ +################################################# +# +# (C) 2010-2011 Calvin Morrison +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/../lib + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + +#### other data ################################# + +INSTALL( FILES kcmkmrml.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) + + +#### kcm_kmrml (module) ########################### + +tde_add_kpart( kcm_kmrml AUTOMOC + SOURCES + kcmkmrml.cpp mainpage.cpp indexer.cpp + serverconfigwidget.ui indexcleaner.cpp + LINK + kmrmlstuff-static kparts-shared kio-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) diff --git a/kmrml/kmrml/lib/CMakeLists.txt b/kmrml/kmrml/lib/CMakeLists.txt new file mode 100644 index 00000000..fb51a3ac --- /dev/null +++ b/kmrml/kmrml/lib/CMakeLists.txt @@ -0,0 +1,26 @@ +################################################# +# +# (C) 2010-2011 Calvin Morrison +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + + +#### kcmkgamma (static) ######################### + +tde_add_library( kmrmlstuff STATIC_PIC AUTOMOC + SOURCES + kmrml_config.cpp mrml_shared.cpp + mrml_utils.cpp watcher_stub.cpp +) diff --git a/kmrml/kmrml/server/CMakeLists.txt b/kmrml/kmrml/server/CMakeLists.txt new file mode 100644 index 00000000..430f2c39 --- /dev/null +++ b/kmrml/kmrml/server/CMakeLists.txt @@ -0,0 +1,35 @@ +################################################# +# +# (C) 2010-2011 Calvin Morrison +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/lib + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + +#### other data ################################# + +INSTALL( FILES daemonwatcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) + + +#### kded_daemonwatcher (module) ################ + +tde_add_kpart( kded_daemonwatcher AUTOMOC + SOURCES watcher.cpp watcher.skel + LINK kmrmlstuff-static kparts-shared kio-shared kdeinit_kded-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) |