diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | doc/extras/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | doc/extras/w3c/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | doc/std/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | embedded/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | embedded/visualboyadvance/CMakeLists.txt | 46 | ||||
| -rw-r--r-- | kdevdesigner/designer/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kdevdesigner/designer/pics/CMakeLists.txt | 85 | ||||
| -rw-r--r-- | lib/interfaces/external/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | lib/util/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | mimetypes/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/newui/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | vcs/cvsservice/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | vcs/cvsservice/integrator/CMakeLists.txt | 3 | 
15 files changed, 215 insertions, 12 deletions
| diff --git a/CMakeLists.txt b/CMakeLists.txt index 48a240b6..cc102ae4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,6 +83,7 @@ option( WITH_VCS_SUBVERSION "Enable subversion support" ${WITH_VCS_ALL} )  option( BUILD_ALL "Build all components" OFF )  option( BUILD_KDEVDESIGNER "Build kdevdesigner" ${BUILD_ALL} ) +option( BUILD_VISUALBOYADVANCE "Build embedded/visualboyadvance" ${BUILD_ALL} )  option( BUILD_DOC "Build doc" ${BUILD_ALL} ) @@ -164,6 +165,7 @@ add_subdirectory( languages )  add_subdirectory( mimetypes )  add_subdirectory( pics )  add_subdirectory( vcs ) +add_subdirectory( embedded )  tde_conditional_add_subdirectory( BUILD_KDEVDESIGNER kdevdesigner )  tde_conditional_add_subdirectory( BUILD_DOC doc ) diff --git a/doc/extras/CMakeLists.txt b/doc/extras/CMakeLists.txt new file mode 100644 index 00000000..dd7c977f --- /dev/null +++ b/doc/extras/CMakeLists.txt @@ -0,0 +1,18 @@ +################################################# +# +#  (C) 2012 Slavek Banko +#  slavek (DOT) banko (AT) axis.cz +# +#  Improvements and feedback are welcome +# +#  This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( w3c ) + +install( +  FILES +    sdl.toc opengl.toc +  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs +) diff --git a/doc/extras/w3c/CMakeLists.txt b/doc/extras/w3c/CMakeLists.txt new file mode 100644 index 00000000..7424e5fd --- /dev/null +++ b/doc/extras/w3c/CMakeLists.txt @@ -0,0 +1,16 @@ +################################################# +# +#  (C) 2012 Slavek Banko +#  slavek (DOT) banko (AT) axis.cz +# +#  Improvements and feedback are welcome +# +#  This file is released under GPL >= 2 +# +################################################# + +install( +  FILES +    w3c-dom-level2-html.toc w3c-svg.toc w3c-uaag10.toc +  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs +) diff --git a/doc/std/CMakeLists.txt b/doc/std/CMakeLists.txt new file mode 100644 index 00000000..3c034ee5 --- /dev/null +++ b/doc/std/CMakeLists.txt @@ -0,0 +1,16 @@ +################################################# +# +#  (C) 2012 Slavek Banko +#  slavek (DOT) banko (AT) axis.cz +# +#  Improvements and feedback are welcome +# +#  This file is released under GPL >= 2 +# +################################################# + +install( +  FILES +    kdev3api.toc +  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs +) diff --git a/embedded/CMakeLists.txt b/embedded/CMakeLists.txt new file mode 100644 index 00000000..da81f49f --- /dev/null +++ b/embedded/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +#  (C) 2012 Slavek Banko +#  slavek (DOT) banko (AT) axis.cz +# +#  Improvements and feedback are welcome +# +#  This file is released under GPL >= 2 +# +################################################# + +tde_conditional_add_subdirectory( BUILD_VISUALBOYADVANCE visualboyadvance ) diff --git a/embedded/visualboyadvance/CMakeLists.txt b/embedded/visualboyadvance/CMakeLists.txt new file mode 100644 index 00000000..be7cf42f --- /dev/null +++ b/embedded/visualboyadvance/CMakeLists.txt @@ -0,0 +1,46 @@ +################################################# +# +#  (C) 2012 Slavek Banko +#  slavek (DOT) banko (AT) axis.cz +# +#  Improvements and feedback are welcome +# +#  This file is released under GPL >= 2 +# +################################################# + +include_directories( +  ${CMAKE_CURRENT_BINARY_DIR} +  ${CMAKE_SOURCE_DIR}/lib/interfaces +  ${CMAKE_SOURCE_DIR}/lib/interfaces/extensions +  ${CMAKE_SOURCE_DIR}/lib/util +  ${TDE_INCLUDE_DIR} +  ${TQT_INCLUDE_DIRS} +) + +link_directories( +  ${TQT_LIBRARY_DIRS} +) + + +##### kdevvisualboyadvance (module) ############# + +tde_add_kpart( libkdevvisualboyadvance AUTOMOC +  SOURCES +    visualboyadvance_part.cpp vbaconfigwidgetbase.ui vbaconfigwidget.cpp +  LINK tdevelop-shared +  DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data ################################ + +install( +  FILES kdevvisualboyadvance.desktop +  DESTINATION ${SERVICES_INSTALL_DIR} +) + +install( +  FILES kdevpart_visualboyadvance.rc +  DESTINATION ${DATA_INSTALL_DIR}/kdevvisualboyadvance +) diff --git a/kdevdesigner/designer/CMakeLists.txt b/kdevdesigner/designer/CMakeLists.txt index dfd7f914..c0f54fe8 100644 --- a/kdevdesigner/designer/CMakeLists.txt +++ b/kdevdesigner/designer/CMakeLists.txt @@ -35,6 +35,8 @@ install( FILES      kdevdesigner_part.rc kdevdesigner_part_sh.rc    DESTINATION ${DATA_INSTALL_DIR}/kdevdesignerpart ) +add_subdirectory( pics ) +  ##### libkdevdesignerpart (module) ############## @@ -99,7 +101,7 @@ tde_moc( SRCS  tde_add_kpart( libkdevdesignerpart AUTOMOC    SOURCES ${SRCS}    LINK -    kdevqui-static shared-static kinterfacedesigner-static +    kdevqui-static shared-static kinterfacedesigner-shared      kio-shared kparts-shared qassistantclient    DESTINATION ${PLUGIN_INSTALL_DIR}  ) diff --git a/kdevdesigner/designer/pics/CMakeLists.txt b/kdevdesigner/designer/pics/CMakeLists.txt new file mode 100644 index 00000000..3b6367c0 --- /dev/null +++ b/kdevdesigner/designer/pics/CMakeLists.txt @@ -0,0 +1,85 @@ +################################################# +# +#  (C) 2012 Slavek Banko +#  slavek (DOT) banko (AT) axis.cz +# +#  Improvements and feedback are welcome +# +#  This file is released under GPL >= 2 +# +################################################# + +install( +  FILES +    designer_adjustsize.png designer_appicon.png designer_arrow.png +    designer_background.png designer_book.png designer_buttongroup.png +    designer_checkbox.png designer_combobox.png designer_connecttool.png +    designer_cross.png designer_customwidget.png designer_d_adjustsize.png +    designer_d_book.png designer_d_buttongroup.png designer_d_checkbox.png +    designer_d_combobox.png designer_d_connecttool.png designer_d_customwidget.png +    designer_d_databrowser.png designer_d_datatable.png designer_d_dataview.png +    designer_d_dateedit.png designer_d_datetimeedit.png designer_d_dial.png +    designer_d_down.png designer_d_editbreaklayout.png designer_d_editcopy.png +    designer_d_editcut.png designer_d_editdelete.png designer_d_editgrid.png +    designer_d_edithlayout.png designer_d_edithlayoutsplit.png +    designer_d_editlower.png designer_d_editpaste.png designer_d_editraise.png +    designer_d_editslots.png designer_d_editvlayout.png +    designer_d_editvlayoutsplit.png designer_d_filenew.png designer_d_fileopen.png +    designer_d_filesave.png designer_d_folder.png designer_d_form.png +    designer_d_frame.png designer_d_groupbox.png designer_d_help.png +    designer_d_home.png designer_d_iconview.png designer_d_image.png +    designer_d_label.png designer_d_layout.png designer_d_lcdnumber.png +    designer_d_left.png designer_d_line.png designer_d_lineedit.png +    designer_d_listbox.png designer_d_listview.png designer_d_multilineedit.png +    designer_d_newform.png designer_d_ordertool.png designer_d_pixlabel.png +    designer_d_pointer.png designer_d_print.png designer_d_progress.png +    designer_d_project.png designer_d_pushbutton.png designer_d_radiobutton.png +    designer_d_redo.png designer_d_richtextedit.png designer_d_right.png +    designer_d_scrollbar.png designer_d_searchfind.png designer_d_setbuddy.png +    designer_d_slider.png designer_d_spacer.png designer_d_spinbox.png +    designer_d_table.png designer_d_tabwidget.png designer_d_textbold.png +    designer_d_textbrowser.png designer_d_textcenter.png designer_d_textedit.png +    designer_d_textfont.png designer_d_texth1.png designer_d_texth2.png +    designer_d_texth3.png designer_d_textitalic.png designer_d_textjustify.png +    designer_d_textlarger.png designer_d_textleft.png designer_d_textlinebreak.png +    designer_d_textparagraph.png designer_d_textright.png designer_d_textsmaller.png +    designer_d_textteletext.png designer_d_textunderline.png designer_d_textview.png +    designer_d_timeedit.png designer_d_toolbox.png designer_d_toolbutton.png +    designer_d_undo.png designer_d_up.png designer_d_widgetstack.png +    designer_d_wizarddata.png designer_d_wizarddialog.png designer_d_wordwrap.png +    designer_databrowser.png designer_datatable.png designer_dataview.png +    designer_dateedit.png designer_datetimeedit.png designer_dial.png +    designer_down.png designer_editbreaklayout.png designer_editcopy.png +    designer_editcut.png designer_editdelete.png designer_editgrid.png +    designer_edithlayout.png designer_edithlayoutsplit.png designer_editlower.png +    designer_editpaste.png designer_editraise.png designer_editslots.png +    designer_editvlayout.png designer_editvlayoutsplit.png designer_filenew.png +    designer_fileopen.png designer_filesave.png designer_folder.png +    designer_form.png designer_frame.png designer_groupbox.png designer_hand.png +    designer_help.png designer_home.png designer_hsplit.png designer_ibeam.png +    designer_iconview.png designer_image.png designer_label.png designer_layout.png +    designer_lcdnumber.png designer_left.png designer_line.png designer_lineedit.png +    designer_listbox.png designer_listview.png designer_multilineedit.png +    designer_newform.png designer_no.png designer_object.png designer_ordertool.png +    designer_pixlabel.png designer_pointer.png designer_print.png +    designer_progress.png designer_project.png designer_pushbutton.png +    designer_qtlogo.png designer_radiobutton.png designer_redo.png +    designer_resetproperty.png designer_richtextedit.png designer_right.png +    designer_s_down.png designer_s_editcut.png designer_s_left.png +    designer_s_right.png designer_s_up.png designer_scrollbar.png +    designer_searchfind.png designer_setbuddy.png designer_sizeall.png +    designer_sizeb.png designer_sizef.png designer_sizeh.png designer_sizev.png +    designer_slider.png designer_spacer.png designer_spinbox.png designer_splash.png +    designer_table.png designer_tabwidget.png designer_textbold.png +    designer_textbrowser.png designer_textcenter.png designer_textedit.png +    designer_textfont.png designer_texth1.png designer_texth2.png +    designer_texth3.png designer_textitalic.png designer_textjustify.png +    designer_textlarger.png designer_textleft.png designer_textlinebreak.png +    designer_textparagraph.png designer_textright.png designer_textsmaller.png +    designer_textteletext.png designer_textunderline.png designer_textview.png +    designer_timeedit.png designer_toolbox.png designer_toolbutton.png +    designer_undo.png designer_up.png designer_uparrow.png designer_vsplit.png +    designer_wait.png designer_widgetstack.png designer_wizarddata.png +    designer_wizarddialog.png designer_wordwrap.png +  DESTINATION ${DATA_INSTALL_DIR}/kdevdesignerpart/pics +) diff --git a/lib/interfaces/external/CMakeLists.txt b/lib/interfaces/external/CMakeLists.txt index 1a12815c..cee645d0 100644 --- a/lib/interfaces/external/CMakeLists.txt +++ b/lib/interfaces/external/CMakeLists.txt @@ -23,8 +23,11 @@ install( FILES    DESTINATION ${INCLUDE_INSTALL_DIR}/kinterfacedesigner ) -##### kinterfacedesigner (static) ############### +##### kinterfacedesigner (shared) ############### -tde_add_library( kinterfacedesigner STATIC_PIC AUTOMOC +tde_add_library( kinterfacedesigner SHARED AUTOMOC    SOURCES designer.cpp +  LINK kparts-shared tdeui-shared +  VERSION 0.0.0 +  DESTINATION ${LIB_INSTALL_DIR}  ) diff --git a/lib/util/CMakeLists.txt b/lib/util/CMakeLists.txt index f075a840..378c4dca 100644 --- a/lib/util/CMakeLists.txt +++ b/lib/util/CMakeLists.txt @@ -23,7 +23,7 @@ include_directories(  install( FILES      domutil.h execcommand.h filetemplate.h urlutil.h      configwidgetproxy.h rurl.h kscriptactionmanager.h -  DESTINATION ${INCLUDE_INSTALL_DIR} ) +  DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/util )  ##### kdevutil (static) ######################### diff --git a/mimetypes/CMakeLists.txt b/mimetypes/CMakeLists.txt index 00999dfd..b2684080 100644 --- a/mimetypes/CMakeLists.txt +++ b/mimetypes/CMakeLists.txt @@ -11,4 +11,4 @@  install( FILES      x-fortran.desktop -  DESTINATION ${MIME_INSTALL_DIR} ) +  DESTINATION ${MIME_INSTALL_DIR}/text ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 34684aa9..ca02daae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -92,7 +92,7 @@ tde_add_library( kdevshell SHARED AUTOMOC      toplevel.cpp    VERSION 0.0.0    LINK -    kdevutil-static d-static kinterfacedesigner-static +    kdevutil-static d-shared kinterfacedesigner-shared      profileengine-shared tdevelop-shared kdevwidgets-shared    DESTINATION ${LIB_INSTALL_DIR}  ) diff --git a/src/newui/CMakeLists.txt b/src/newui/CMakeLists.txt index b65bff6a..046c2c7f 100644 --- a/src/newui/CMakeLists.txt +++ b/src/newui/CMakeLists.txt @@ -16,10 +16,13 @@ include_directories(  ) -##### d (static) ################################ +##### d (shared) ################################ -tde_add_library( d STATIC_PIC AUTOMOC +tde_add_library( d SHARED AUTOMOC    SOURCES      dmainwindow.cpp buttonbar.cpp button.cpp ddockwindow.cpp      docksplitter.cpp dtabwidget.cpp +  LINK kparts-shared tdecore-shared tdeui-shared +  VERSION 0.0.0 +  DESTINATION ${LIB_INSTALL_DIR}  ) diff --git a/vcs/cvsservice/CMakeLists.txt b/vcs/cvsservice/CMakeLists.txt index f39636dc..b02db663 100644 --- a/vcs/cvsservice/CMakeLists.txt +++ b/vcs/cvsservice/CMakeLists.txt @@ -9,8 +9,6 @@  #  ################################################# -tde_import( cervisia ) -  add_subdirectory( integrator )  include_directories( @@ -25,6 +23,7 @@ include_directories(  link_directories(    ${TQT_LIBRARY_DIRS} +  ${TDE_LIB_DIR}  ) @@ -54,6 +53,6 @@ tde_add_kpart( libkdevcvsservice AUTOMOC      annotatepage.cpp annotateview.cpp    LINK      kdevextensions-static kdevwidgets-shared tdevelop-shared -    cvsservice-shared khtml-shared +    cvsservice khtml-shared    DESTINATION ${PLUGIN_INSTALL_DIR}  ) diff --git a/vcs/cvsservice/integrator/CMakeLists.txt b/vcs/cvsservice/integrator/CMakeLists.txt index cc6e59eb..a17393d8 100644 --- a/vcs/cvsservice/integrator/CMakeLists.txt +++ b/vcs/cvsservice/integrator/CMakeLists.txt @@ -19,6 +19,7 @@ include_directories(  link_directories(    ${TQT_LIBRARY_DIRS} +  ${TDE_LIB_DIR}  ) @@ -34,6 +35,6 @@ tde_add_kpart( libcvsserviceintegrator AUTOMOC      cvsserviceintegrator.cpp integratordlgbase.ui      fetcherdlgbase.ui integratordlg.cpp initdlg.ui    LINK -    kdevextras-shared tdevelop-shared cvsservice-shared +    kdevextras-shared tdevelop-shared cvsservice    DESTINATION ${PLUGIN_INSTALL_DIR}  ) | 
