mirror of
https://bitbucket.org/smil3y/kde-extraapps.git
synced 2025-02-23 10:22:52 +00:00
kdevelop: fix bootstrapping and adjust to recent changes
This commit is contained in:
Ivailo Monev
parent
a165a95a57
commit
4b7544d29b
57 changed files with 143 additions and 211 deletions
|
|
@ -61,9 +61,9 @@ macro_optional_add_subdirectory (skanlite)
|
|||
macro_optional_add_subdirectory (svgpart)
|
||||
macro_optional_add_subdirectory (thumbnailers)
|
||||
macro_optional_add_subdirectory (yakuake)
|
||||
# FIXME: half of the tests of kdevplatform are noop
|
||||
# FIXME: tests for those bellow are broken
|
||||
set(ENABLE_TESTING OFF)
|
||||
macro_optional_add_subdirectory (kdevplatform)
|
||||
# FIXME: bootstrap fails because of kdevplatform not being found
|
||||
# macro_optional_add_subdirectory (kdevelop)
|
||||
macro_optional_add_subdirectory (kdevelop)
|
||||
|
||||
macro_display_feature_log()
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ target_link_libraries(testdebug ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} amarok
|
|||
|
||||
set( testenginecontroller_SRCS TestEngineController.cpp )
|
||||
kde4_add_unit_test( testenginecontroller ${testenginecontroller_SRCS} )
|
||||
target_link_libraries( testenginecontroller ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} amaroklib amarokcore )
|
||||
target_link_libraries( testenginecontroller ${KDE4_THREADWEAVER_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} amaroklib amarokcore )
|
||||
|
||||
#------------------------ Test Expression -----------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ target_link_libraries(testsinglecollectiontreeitemmodel
|
|||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${QT_QTGUI_LIBRARY}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
${QT_QTTEST_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${GOOGLEMOCK_LIBRARIES})
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ macro(add_database_test test_target test_sources)
|
|||
amarok-sqlcollection
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KIO_LIBS}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${QT_QTTEST_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ target_link_libraries(testmemoryquerymaker
|
|||
amaroklib
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${QT_QTGUI_LIBRARY}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
${QT_QTTEST_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${GOOGLEMOCK_LIBRARIES})
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ target_link_libraries( testproxylogger
|
|||
${KDE4_KDECORE_LIBS}
|
||||
${QT_QTTEST_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
${GOOGLEMOCK_LIBRARIES}
|
||||
${CMAKE_DL_LIBS})
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ target_link_libraries( testmetamultitrack
|
|||
${KDE4_KIO_LIBS}
|
||||
${KDE4_PHONON_LIBRARY}
|
||||
${KDE4_SOLID_LIBS}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
${QT_QTTEST_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${GOOGLEMOCK_LIBRARIES}
|
||||
|
|
|
|||
|
|
@ -9,25 +9,25 @@ include_directories( .
|
|||
|
||||
set( testasxplaylist_SRCS asx/TestASXPlaylist.cpp )
|
||||
kde4_add_unit_test( testasxplaylist ${testasxplaylist_SRCS} )
|
||||
target_link_libraries( testasxplaylist ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} amarokcore amaroklib )
|
||||
target_link_libraries( testasxplaylist ${KDE4_THREADWEAVER_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} amarokcore amaroklib )
|
||||
|
||||
#------------------------ Test M3UPlaylist -----------------------------
|
||||
|
||||
set( testm3uplaylist_SRCS m3u/TestM3UPlaylist.cpp )
|
||||
kde4_add_unit_test( testm3uplaylist ${testm3uplaylist_SRCS} )
|
||||
target_link_libraries( testm3uplaylist ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} amarokcore amaroklib )
|
||||
target_link_libraries( testm3uplaylist ${KDE4_THREADWEAVER_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} amarokcore amaroklib )
|
||||
|
||||
#------------------------ Test PLSPlaylist -----------------------------
|
||||
|
||||
set( testplsplaylist_SRCS pls/TestPLSPlaylist.cpp )
|
||||
kde4_add_unit_test( testplsplaylist ${testplsplaylist_SRCS} )
|
||||
target_link_libraries( testplsplaylist ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} amarokcore amaroklib )
|
||||
target_link_libraries( testplsplaylist ${KDE4_THREADWEAVER_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} amarokcore amaroklib )
|
||||
|
||||
#------------------------ Test XSPFPLAYLIST -----------------------------
|
||||
|
||||
set( testxspfplaylist_SRCS xspf/TestXSPFPlaylist.cpp )
|
||||
kde4_add_unit_test( testxspfplaylist ${testxspfplaylist_SRCS} )
|
||||
target_link_libraries( testxspfplaylist ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} amarokcore amaroklib )
|
||||
target_link_libraries( testxspfplaylist ${KDE4_THREADWEAVER_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} amarokcore amaroklib )
|
||||
|
||||
#------------------------ Test PlaylistFileSupport -----------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -8,5 +8,5 @@ target_link_libraries( testtrackloader
|
|||
${KDE4_KDECORE_LIBS}
|
||||
${QT_QTTEST_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -7,4 +7,4 @@ include_directories( .
|
|||
|
||||
set( testtrackforurlworker_SRCS TestTrackForUrlWorker.cpp ../../../mocks/MockTrackForUrlWorker.cpp )
|
||||
kde4_add_unit_test( testtrackforurlworker ${testtrackforurlworker_SRCS} )
|
||||
target_link_libraries( testtrackforurlworker ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${KDE4_THREADWEAVER_LIBRARIES} amarokcore amaroklib )
|
||||
target_link_libraries( testtrackforurlworker ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${KDE4_THREADWEAVER_LIBS} amarokcore amaroklib )
|
||||
|
|
|
|||
|
|
@ -16,4 +16,4 @@ set( testplaylistobserver_SRCS
|
|||
${AMAROK_SOURCE_TREE}/core/playlists/Playlist.cpp
|
||||
)
|
||||
kde4_add_unit_test( testplaylistobserver ${testplaylistobserver_SRCS} )
|
||||
target_link_libraries( testplaylistobserver ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} amarokcore amaroklib )
|
||||
target_link_libraries( testplaylistobserver ${KDE4_THREADWEAVER_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} amarokcore amaroklib )
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ macro(link_database_test test_target)
|
|||
amaroklib
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KIO_LIBS}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${QT_QTTEST_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ set( testimporterscommon_LIBS
|
|||
amarokcore
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${KDE4_KIO_LIBS}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
${QT_QTSQL_LIBRARY}
|
||||
${QT_QTTEST_LIBRARY}
|
||||
${GOOGLEMOCK_LIBRARIES}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ macro(add_database_test test_target test_sources)
|
|||
amarokshared
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KIO_LIBS}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${QT_QTTEST_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ kde4_add_unit_test( testamazonparser ${testamazonparser_SRCS} )
|
|||
target_link_libraries( testamazonparser
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KDEUI_LIBS}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
${QT_QTTEST_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${QT_QTXML_LIBRARY}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ target_link_libraries(testmasterslavesynchronizationjob
|
|||
${KDE4_KIO_LIBS}
|
||||
${KDE4_SOLID_LIBRARY}
|
||||
${QT_QTGUI_LIBRARY}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
${QT_QTTEST_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${GOOGLEMOCK_LIBRARIES})
|
||||
|
|
@ -56,7 +56,7 @@ target_link_libraries(testunionjob
|
|||
${KDE4_KDEUI_LIBS}
|
||||
${KDE4_SOLID_LIBRARY}
|
||||
${QT_QTGUI_LIBRARY}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
${QT_QTTEST_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${GOOGLEMOCK_LIBRARIES})
|
||||
|
|
@ -82,7 +82,7 @@ target_link_libraries(testonewaysynchronizationjob
|
|||
${KDE4_KDEUI_LIBS}
|
||||
${KDE4_SOLID_LIBRARY}
|
||||
${QT_QTGUI_LIBRARY}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
${QT_QTTEST_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${GOOGLEMOCK_LIBRARIES})
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
ChangeLog for kdevelop v4.7.1
|
||||
=============================
|
||||
|
||||
* Milian Wolff: Prepare release of 4.7.1
|
||||
* Kevin Funk: Fix CMakePreferences sizing
|
||||
* Kevin Funk: cpp: Fix conversion warnings
|
||||
* Kevin Funk: PVS V555 fix
|
||||
* Kevin Funk: includeswidget: Use KMessageWidget
|
||||
* Kevin Funk: Lower-case project name
|
||||
* René J.V. Bertin: Avoid setting CMake variables globally that also exist as target-specific.
|
||||
* René J.V. Bertin: OS X: * additional protection against App Nap and automaticTermination * really set the BundleDisplayName * generate an application icon resource
|
||||
* René J.V. Bertin: [OS X] Set the Info.plist bundle name to KDevelop and the Info String to the longer string. Also disable support for automatic termination in the Info.plist.
|
||||
* Kevin Funk: mac: Use correct bundle version
|
||||
* HuiJie Zhang: Fix bug on multi-line function-macros expansion,
|
||||
* Milian Wolff: Delete some dead code
|
||||
* René J.V. Bertin: fix indentation REVIEW: 121391
|
||||
* René J.V. Bertin: [OS X] create a dedicated Info.plist for kdevelop REVIEW: 121394
|
||||
* René J.V. Bertin: Avoid inappropriate warning about faulty ninja.build file from gdb/CMakeLists.txt REVIEW: 121391
|
||||
* Kevin Funk: Hack for making build with CMake 2.8 and Ninja
|
||||
* Kevin Funk: Remove .kdev4 file from subdirectory
|
||||
* Kevin Funk: Revert "MissingDeclarationAssistant: Only show identifier"
|
||||
* Kevin Funk: Disable missing decl assistant for namespaced ids
|
||||
* Kevin Funk: Fix test in combination with GCC 4.9.1 and -O2
|
||||
* Kevin Funk: Don't access dangling pointer
|
||||
* Nicolas Werner: Fix environment-cd for paths containing spaces.
|
||||
* Kevin Funk: Make compile for me
|
||||
* Milian Wolff: Reduce QVariant usage.
|
||||
* Milian Wolff: Fix regressions introduced by recent refactoring.
|
||||
* Milian Wolff: Minor code cleanup
|
||||
* Milian Wolff: Use the add_debuggable_executable macro everywhere its required.
|
||||
* Milian Wolff: Revert "Use debugfull configuration whenever it is available."
|
||||
* Milian Wolff: Use debugfull configuration whenever it is available.
|
||||
* Milian Wolff: Refactor the custom defines and includes plugin.
|
||||
* Milian Wolff: Fix regression: Don't remove the KDEV_USE_EXTENSION_INTERFACE.
|
||||
* Milian Wolff: Fix assertion about unknown projects in the IDAIM.
|
||||
* Aleix Pol: Change precedence of default include paths
|
||||
* Milian Wolff: Fixup signal connection
|
||||
* Milian Wolff: Fix compile with clang 3.5
|
||||
* Pino Toscano: gdb: "#else if" does not exist, "#elif" does
|
||||
* Pino Toscano: gdb: fix member order
|
||||
* Pino Toscano: fix ByteArray/QByteArray typo
|
||||
* René J.V. Bertin: Enables the debugger on OS X. Requires presence of a recent gdb version, e.g. from MacPorts. REVIEW: 120510
|
||||
* Kevin Funk: Fix uninitialized member 'kind'
|
||||
|
|
@ -37,7 +37,27 @@ if("${_isSystemLibDir}" STREQUAL "-1")
|
|||
endif("${_isSystemLibDir}" STREQUAL "-1")
|
||||
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
|
||||
find_package(KDevPlatform REQUIRED)
|
||||
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
find_package(kdevplatform REQUIRED)
|
||||
else()
|
||||
set(KDEVPLATFORM_INCLUDE_DIR
|
||||
${CMAKE_SOURCE_DIR}/kdevplatform
|
||||
${CMAKE_SOURCE_DIR}/kdevplatform/plugins
|
||||
${CMAKE_BINARY_DIR}/kdevplatform
|
||||
)
|
||||
set(KDEVPLATFORM_INTERFACES_LIBRARIES kdevplatforminterfaces)
|
||||
set(KDEVPLATFORM_SHELL_LIBRARIES kdevplatformshell)
|
||||
set(KDEVPLATFORM_UTIL_LIBRARIES kdevplatformutil)
|
||||
set(KDEVPLATFORM_LANGUAGE_LIBRARIES kdevplatformlanguage)
|
||||
set(KDEVPLATFORM_DOCUMENTATION_LIBRARIES kdevplatformdocumentation)
|
||||
set(KDEVPLATFORM_DEBUGGER_LIBRARIES kdevplatformdebugger)
|
||||
set(KDEVPLATFORM_TESTS_LIBRARIES kdevplatformtests)
|
||||
set(KDEVPLATFORM_JSONTESTS_LIBRARIES kdevplatformjsontests)
|
||||
set(KDEVPLATFORM_PROJECT_LIBRARIES kdevplatformproject)
|
||||
set(KDEVPLATFORM_VCS_LIBRARIES kdevplatformvcs)
|
||||
set(KDEVPLATFORM_OUTPUTVIEW_LIBRARIES kdevplatformoutputview)
|
||||
set(KDEVPLATFORM_SUBLIME_LIBRARIES sublime)
|
||||
endif()
|
||||
|
||||
include_directories(${KDEVPLATFORM_INCLUDE_DIR})
|
||||
|
||||
|
|
|
|||
|
|
@ -10,13 +10,8 @@ if(KDECLARATIVE_FOUND)
|
|||
set(kdevelop_SRCS ${kdevelop_SRCS}
|
||||
welcomepage/sessionsmodel.cpp welcomepage/welcomepageview.cpp welcomepage/uihelper.cpp)
|
||||
add_definitions(-DWITH_WELCOMEPAGE)
|
||||
qt4_add_resources(kdevelop_SRCS welcomepage/welcomepage.qrc)
|
||||
qt4_add_resources(kdevelop_SRCS welcomepage/welcomepage.qrc)
|
||||
endif(KDECLARATIVE_FOUND)
|
||||
if(APPLE)
|
||||
kde4_add_app_icon(kdevelop_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/kdevelop.png")
|
||||
else()
|
||||
kde4_add_app_icon(kdevelop_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pics/hi*-app-kdevelop.png")
|
||||
endif(APPLE)
|
||||
|
||||
add_executable(kdevelop ${kdevelop_SRCS} )
|
||||
|
||||
|
|
@ -29,7 +24,7 @@ target_link_libraries(kdevelop
|
|||
${KDE4_KPARTS_LIBS}
|
||||
${KDE4_KNOTIFYCONFIG_LIBS}
|
||||
${KDE4_KTEXTEDITOR_LIBS}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
|
||||
${QT_QTDECLARATIVE_LIBRARIES}
|
||||
)
|
||||
|
|
@ -41,30 +36,6 @@ install(TARGETS kdevelop ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
|||
|
||||
install(FILES kdevelop! DESTINATION bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
|
||||
|
||||
if(APPLE)
|
||||
kde4_add_app_icon(kdevelop_bin_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/kdevelop.png")
|
||||
else()
|
||||
kde4_add_app_icon(kdevelop_bin_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pics/hi*-app-kdevelop.png")
|
||||
endif(APPLE)
|
||||
|
||||
if (APPLE)
|
||||
# the MacOSX bundle display name property (CFBundleDisplayName) is not currently supported by cmake,
|
||||
# so has to be set for all targets in this cmake file
|
||||
set(MACOSX_BUNDLE_DISPLAY_NAME KDevelop)
|
||||
# We provide our own Info.plist to disable AppNap for KDevelop:
|
||||
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in)
|
||||
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.KDevelop")
|
||||
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDevelop")
|
||||
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_DISPLAY_NAME "KDevelop")
|
||||
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_INFO_STRING "The KDevelop Integrated Development Environment")
|
||||
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_LONG_VERSION_STRING "KDevelop ${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}")
|
||||
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING "${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}")
|
||||
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${KDEVELOP_VERSION_MAJOR}.${KDEVELOP_VERSION_MINOR}")
|
||||
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_ICON_FILE "kdevelop_SRCS.icns")
|
||||
set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_COPYRIGHT "KDevelop Team")
|
||||
endif (APPLE)
|
||||
|
||||
|
||||
########### install files ###############
|
||||
|
||||
install( PROGRAMS kdevelop.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
|
||||
|
|
|
|||
|
|
@ -5,4 +5,5 @@ set(apptemplate_DIRS
|
|||
cpp/CMake/cmake_plaincpp
|
||||
)
|
||||
|
||||
include(${CMAKE_SOURCE_DIR}/kdevplatform/cmake/modules/KDevPlatformMacros.cmake)
|
||||
kdevplatform_add_app_templates(${apptemplate_DIRS})
|
||||
|
|
|
|||
|
|
@ -12,14 +12,12 @@ function(add_debuggable_executable target)
|
|||
set_target_properties(${target} PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} ${_flags}")
|
||||
endfunction()
|
||||
|
||||
if(NOT APPLE)
|
||||
macro_optional_find_package(KDE4Workspace)
|
||||
|
||||
macro_log_feature( KDE4WORKSPACE_FOUND
|
||||
"KDE 4 Workspace" "KDE 4 Workspace libraries" "kdebase/workspace" FALSE
|
||||
"" "Required for building the process selection dialog for attaching GDB to a running process."
|
||||
)
|
||||
endif(NOT APPLE)
|
||||
|
||||
if(KDE4WORKSPACE_FOUND)
|
||||
include_directories(
|
||||
|
|
@ -41,9 +39,7 @@ add_subdirectory(printers)
|
|||
|
||||
add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9012 )
|
||||
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
#add_subdirectory(tests)
|
||||
|
||||
|
|
@ -81,6 +77,11 @@ set(kdevgdb_PART_SRCS
|
|||
registers/registercontroller_arm.cpp
|
||||
registers/modelsmanager.cpp
|
||||
registers/converters.cpp
|
||||
debuggertracingdialog.ui
|
||||
debuggerconfigwidget.ui
|
||||
selectcore.ui
|
||||
selectaddress.ui
|
||||
registers/registersview.ui
|
||||
)
|
||||
|
||||
if(KDE4WORKSPACE_FOUND)
|
||||
|
|
@ -90,15 +91,6 @@ if(KDE4WORKSPACE_FOUND)
|
|||
)
|
||||
endif(KDE4WORKSPACE_FOUND)
|
||||
|
||||
set(kdevgdb_PART_UI
|
||||
debuggertracingdialog.ui
|
||||
debuggerconfigwidget.ui
|
||||
selectcore.ui
|
||||
selectaddress.ui
|
||||
registers/registersview.ui
|
||||
)
|
||||
|
||||
kde4_add_ui_files(kdevgdb_PART_SRCS ${kdevgdb_PART_UI})
|
||||
kde4_add_plugin(kdevgdb ${kdevgdb_PART_SRCS})
|
||||
target_link_libraries(kdevgdb ${KDEVPLATFORM_SUBLIME_LIBRARIES}
|
||||
${KDEVPLATFORM_INTERFACES_LIBRARIES}
|
||||
|
|
@ -144,6 +136,9 @@ set(gdbtest_PART_SRCS
|
|||
registers/registercontroller_arm.cpp
|
||||
registers/modelsmanager.cpp
|
||||
registers/converters.cpp
|
||||
debuggertracingdialog.ui
|
||||
selectaddress.ui
|
||||
registers/registersview.ui
|
||||
)
|
||||
|
||||
if(KDE4WORKSPACE_FOUND)
|
||||
|
|
@ -153,12 +148,7 @@ if(KDE4WORKSPACE_FOUND)
|
|||
)
|
||||
endif(KDE4WORKSPACE_FOUND)
|
||||
|
||||
kde4_add_ui_files(gdbtest_PART_SRCS
|
||||
debuggertracingdialog.ui
|
||||
selectaddress.ui
|
||||
registers/registersview.ui
|
||||
)
|
||||
kde4_add_unit_test(gdbtest ${gdbtest_PART_SRCS})
|
||||
kde4_add_test(gdbtest ${gdbtest_PART_SRCS})
|
||||
target_link_libraries(gdbtest
|
||||
${QT_QTTEST_LIBRARY}
|
||||
${KDEVPLATFORM_SHELL_LIBRARIES}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
add_subdirectory(tests)
|
||||
if(ENABLE_TESTING)
|
||||
add_subdirectory(tests)
|
||||
endif()
|
||||
|
||||
configure_file( gdbinit ${CMAKE_CURRENT_BINARY_DIR}/gdbinit )
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@
|
|||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include <KLocale>
|
||||
|
||||
#include "selectcoredialog.h"
|
||||
|
||||
namespace GDBDebugger {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9045 )
|
||||
add_subdirectory(tests)
|
||||
|
||||
if(ENABLE_TESTING)
|
||||
add_subdirectory(tests)
|
||||
endif()
|
||||
|
||||
set(kdevqthelp_SRCS
|
||||
qthelpplugin.cpp
|
||||
qthelpproviderabstract.cpp
|
||||
|
|
@ -24,9 +28,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevqthelp.desktop DESTINATION ${SERVI
|
|||
set(kdevqthelp_config_SRCS
|
||||
qthelpconfig.cpp
|
||||
qthelp_config_shared.cpp
|
||||
)
|
||||
|
||||
kde4_add_ui_files(kdevqthelp_config_SRCS
|
||||
qthelpconfig.ui
|
||||
qthelpconfigeditdialog.ui
|
||||
)
|
||||
|
|
|
|||
|
|
@ -9,13 +9,9 @@ set(kdevastyle_PART_SRCS
|
|||
lib/ASEnhancer.cpp
|
||||
lib/ASFormatter.cpp
|
||||
lib/ASResource.cpp
|
||||
)
|
||||
|
||||
set(astyle_preferences_UI
|
||||
astyle_preferences.ui
|
||||
)
|
||||
|
||||
kde4_add_ui_files(kdevastyle_PART_SRCS ${astyle_preferences_UI} )
|
||||
kde4_add_plugin(kdevastyle ${kdevastyle_PART_SRCS})
|
||||
target_link_libraries(kdevastyle
|
||||
${KDE4_KDECORE_LIBS}
|
||||
|
|
@ -32,4 +28,6 @@ install(TARGETS kdevastyle DESTINATION ${PLUGIN_INSTALL_DIR} )
|
|||
configure_file(kdevastyle.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdevastyle.desktop)
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevastyle.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
|
||||
|
||||
add_subdirectory(tests)
|
||||
if(ENABLE_TESTING)
|
||||
add_subdirectory(tests)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -11,17 +11,13 @@ include_directories(
|
|||
|
||||
########### next target ###############
|
||||
|
||||
set(kdevexecuteplasmoid_PART_UIS
|
||||
plasmoidexecutionconfig.ui
|
||||
)
|
||||
|
||||
set(kdevexecuteplasmoid_PART_SRCS
|
||||
executeplasmoidplugin.cpp
|
||||
plasmoidexecutionconfig.cpp
|
||||
plasmoidexecutionjob.cpp
|
||||
plasmoidexecutionconfig.ui
|
||||
)
|
||||
|
||||
kde4_add_ui_files( kdevexecuteplasmoid_PART_SRCS ${kdevexecuteplasmoid_PART_UIS} )
|
||||
kde4_add_plugin(kdevexecuteplasmoid ${kdevexecuteplasmoid_PART_SRCS} )
|
||||
target_link_libraries(kdevexecuteplasmoid
|
||||
${KDE4_KDEUI_LIBS}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
#include <kpluginfactory.h>
|
||||
#include <KDebug>
|
||||
#include <KAboutData>
|
||||
#include <KUrl>
|
||||
#include <interfaces/icore.h>
|
||||
|
||||
using namespace KDevelop;
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
#include <klocale.h>
|
||||
#include <kdebug.h>
|
||||
#include <kicon.h>
|
||||
#include <kconfiggroup.h>
|
||||
#include <interfaces/ilaunchconfiguration.h>
|
||||
#include <interfaces/icore.h>
|
||||
#include <interfaces/iprojectcontroller.h>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
add_subdirectory(tests)
|
||||
if(ENABLE_TESTING)
|
||||
add_subdirectory(tests)
|
||||
endif()
|
||||
|
||||
set(kdevkdeprovider_PART_SRCS kdeprojectsmodel.cpp
|
||||
kdeproviderwidget.cpp
|
||||
kdeproviderplugin.cpp
|
||||
kdeprojectsmodel.cpp
|
||||
kdeprojectsreader.cpp
|
||||
kdeconfig.ui
|
||||
)
|
||||
kde4_add_kcfg_files(kdevkdeprovider_PART_SRCS kdeconfig.kcfgc)
|
||||
kde4_add_ui_files(kdevkdeprovider_PART_SRCS kdeconfig.ui)
|
||||
|
||||
kde4_add_plugin(kdevkdeprovider ${kdevkdeprovider_PART_SRCS})
|
||||
target_link_libraries(kdevkdeprovider ${KDE4_KDEUI_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_VCS_LIBRARIES})
|
||||
|
|
|
|||
|
|
@ -10,7 +10,10 @@ add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9007 )
|
|||
|
||||
add_subdirectory(parser)
|
||||
add_subdirectory(cppduchain)
|
||||
add_subdirectory(tests)
|
||||
if(ENABLE_TESTING)
|
||||
add_subdirectory(tests)
|
||||
endif()
|
||||
|
||||
########### next target ###############
|
||||
|
||||
set(kdevcpplanguagesupport_PART_SRCS
|
||||
|
|
@ -40,15 +43,11 @@ set(kdevcpplanguagesupport_PART_SRCS
|
|||
codegen/customincludepaths.cpp
|
||||
codegen/cppclasshelper.cpp
|
||||
# codegen/makeimplementationprivate.cpp
|
||||
)
|
||||
|
||||
set(kdevcpplanguagesupport_LIB_UI
|
||||
codegen/ui/custom_include_paths.ui
|
||||
# codegen/ui/privateimplementation.ui
|
||||
codegen/custom_include_paths.ui
|
||||
# codegen/privateimplementation.ui
|
||||
)
|
||||
|
||||
kde4_add_ui_files(kdevcpplanguagesupport_PART_SRCS ${kdevcpplanguagesupport_LIB_UI})
|
||||
|
||||
option(BUILD_kdev_includepathresolver "Build the includepath resolver debugging tool" OFF)
|
||||
if(BUILD_kdev_includepathresolver)
|
||||
add_executable(kdev_includepathresolver includepathresolver.cpp)
|
||||
|
|
@ -73,7 +72,7 @@ target_link_libraries(kdevcpplanguagesupport
|
|||
${KDEVPLATFORM_LANGUAGE_LIBRARIES}
|
||||
${KDEVPLATFORM_PROJECT_LIBRARIES}
|
||||
${KDEVPLATFORM_UTIL_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
${KDE4_KDECORE_LIBS}
|
||||
${KDE4_KTEXTEDITOR_LIBS}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
#include <interfaces/iuicontroller.h>
|
||||
#include <kparts/mainwindow.h>
|
||||
#include <kmessagebox.h>
|
||||
#include <kdialog.h>
|
||||
#include <includepathresolver.h>
|
||||
#include <language/backgroundparser/backgroundparser.h>
|
||||
#include <interfaces/ilanguagecontroller.h>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@
|
|||
remove_definitions( -DKDE_DEFAULT_DEBUG_AREA=9007 )
|
||||
add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9041 )
|
||||
|
||||
add_subdirectory(tests)
|
||||
if(ENABLE_TESTING)
|
||||
add_subdirectory(tests)
|
||||
endif()
|
||||
|
||||
include_directories(
|
||||
${cpp_SOURCE_DIR}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@ remove_definitions( -DKDE_DEFAULT_DEBUG_AREA=9007 )
|
|||
add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9040 )
|
||||
|
||||
add_subdirectory(rpp)
|
||||
add_subdirectory(tests)
|
||||
if(ENABLE_TESTING)
|
||||
add_subdirectory(tests)
|
||||
endif()
|
||||
#add_subdirectory(headergen)
|
||||
|
||||
########### next target ###############
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
add_subdirectory( tests )
|
||||
if(ENABLE_TESTING)
|
||||
add_subdirectory(tests)
|
||||
endif()
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
|
||||
include_directories( ${KDevelop_SOURCE_DIR}/languages/cpp/parser ${CMAKE_CURRENT_SOURCE_DIR}/.. )
|
||||
include_directories(
|
||||
${KDevelop_SOURCE_DIR}/languages/cpp/parser
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
)
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
|
@ -8,6 +10,6 @@ set(pp_SRCS
|
|||
main.cpp
|
||||
)
|
||||
|
||||
add_executable(pp TEST ${pp_SRCS})
|
||||
kde4_add_manual_test(pp ${pp_SRCS})
|
||||
target_link_libraries(pp ${KDE4_KDECORE_LIBS} ${KDEVPLATFORM_TESTS_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} kdev4cpprpp)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
|
||||
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/testconfig.h)
|
||||
configure_file(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/testconfig.h.cmake
|
||||
${CMAKE_CURRENT_BINARY_DIR}/testconfig.h
|
||||
)
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
||||
set(parsertest_SRCS test_parser.cpp test_parser_cpp2011.cpp)
|
||||
|
||||
|
||||
kde4_add_unit_test(parsertest ${parsertest_SRCS})
|
||||
kde4_add_test(parsertest ${parsertest_SRCS})
|
||||
target_link_libraries(parsertest ${KDE4_KDECORE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${QT_QTTEST_LIBRARY} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDEVPLATFORM_TESTS_LIBRARIES} kdev4cpprpp kdev4cppparser)
|
||||
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ target_link_libraries(parsertest ${KDE4_KDECORE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} $
|
|||
set(generatortest_SRCS test_generator.cpp)
|
||||
|
||||
|
||||
kde4_add_unit_test(generatortest ${generatortest_SRCS})
|
||||
kde4_add_test(generatortest ${generatortest_SRCS})
|
||||
target_link_libraries(generatortest ${KDE4_KDECORE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${QT_QTTEST_LIBRARY} ${KDEVPLATFORM_TESTS_LIBRARIES} kdev4cpprpp kdev4cppparser)
|
||||
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ target_link_libraries(generatortest ${KDE4_KDECORE_LIBS} ${KDE4_KTEXTEDITOR_LIBS
|
|||
set(pooltest_SRCS test_pool.cpp)
|
||||
|
||||
|
||||
kde4_add_unit_test(pooltest ${pooltest_SRCS})
|
||||
kde4_add_test(pooltest ${pooltest_SRCS})
|
||||
target_link_libraries(pooltest ${KDE4_KDECORE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${QT_QTTEST_LIBRARY} kdev4cppparser)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ target_link_libraries(cppassistantstest ${QT_QTTEST_LIBRARY}
|
|||
kdev4cppparser
|
||||
${KDEVPLATFORM_INTERFACES_LIBRARIES}
|
||||
${KDEVPLATFORM_PROJECT_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
${KDEVPLATFORM_LANGUAGE_LIBRARIES}
|
||||
${KDEVPLATFORM_TESTS_LIBRARIES}
|
||||
${KDE4_KDECORE_LIBS}
|
||||
|
|
@ -141,7 +141,7 @@ target_link_libraries(cppcodecompletiontest ${QT_QTTEST_LIBRARY}
|
|||
kdev4cppparser
|
||||
${KDEVPLATFORM_INTERFACES_LIBRARIES}
|
||||
${KDEVPLATFORM_PROJECT_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBRARIES}
|
||||
${KDE4_THREADWEAVER_LIBS}
|
||||
${KDEVPLATFORM_LANGUAGE_LIBRARIES}
|
||||
${KDEVPLATFORM_TESTS_LIBRARIES}
|
||||
${KDE4_KDECORE_LIBS}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
add_subdirectory(kcm_widget)
|
||||
add_subdirectory(tests)
|
||||
if(ENABLE_TESTING)
|
||||
add_subdirectory(tests)
|
||||
endif()
|
||||
add_subdirectory(compilerprovider)
|
||||
|
||||
set( kdevdefinesandincludesmanager_SRCS
|
||||
definesandincludesmanager.cpp
|
||||
debugarea.cpp
|
||||
)
|
||||
set(kdevdefinesandincludesmanager_SRCS
|
||||
definesandincludesmanager.cpp
|
||||
debugarea.cpp
|
||||
)
|
||||
|
||||
kde4_add_plugin( kdevdefinesandincludesmanager
|
||||
${kdevdefinesandincludesmanager_SRCS})
|
||||
|
|
|
|||
|
|
@ -28,4 +28,6 @@ if(BUILD_kdev_msvcdefinehelper)
|
|||
LIBRARY DESTINATION lib)
|
||||
endif(BUILD_kdev_msvcdefinehelper)
|
||||
|
||||
add_subdirectory(tests)
|
||||
if(ENABLE_TESTING)
|
||||
add_subdirectory(tests)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -11,9 +11,6 @@ set( kcm_customdefinesandincludes_SRCS
|
|||
../debugarea.cpp
|
||||
compilersmodel.cpp
|
||||
compilerswidget.cpp
|
||||
)
|
||||
|
||||
kde4_add_ui_files( kcm_customdefinesandincludes_SRCS
|
||||
batchedit.ui
|
||||
includeswidget.ui
|
||||
defineswidget.ui
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
#include "compilerswidget.h"
|
||||
|
||||
#include <KAction>
|
||||
#include <KLocale>
|
||||
#include <QMenu>
|
||||
#include <QSignalMapper>
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
#include "defineswidget.h"
|
||||
|
||||
#include <KAction>
|
||||
#include <KLocale>
|
||||
|
||||
#include "ui_defineswidget.h"
|
||||
#include "definesmodel.h"
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
|
||||
#include <KAction>
|
||||
#include <kfiledialog.h>
|
||||
#include <klocale.h>
|
||||
|
||||
#include <QFileInfo>
|
||||
|
||||
|
|
|
|||
|
|
@ -32,16 +32,11 @@ configure_file(kdevcmakebuilder.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdevcm
|
|||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevcmakebuilder.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
|
||||
########### next target ###############
|
||||
|
||||
set( cmakebuilder_cfg_SRCS
|
||||
set(cmakebuilder_cfg_SRCS
|
||||
cmakebuilderpreferences.cpp
|
||||
)
|
||||
|
||||
set( cmakebuilder_cfg_UI
|
||||
cmakebuildersettings.ui
|
||||
)
|
||||
|
||||
|
||||
kde4_add_ui_files( cmakebuilder_cfg_SRCS ${cmakebuilder_cfg_UI} )
|
||||
kde4_add_kcfg_files( cmakebuilder_cfg_SRCS cmakebuilderconfig.kcfgc )
|
||||
|
||||
kde4_add_plugin( kcm_kdev_cmakebuilder ${cmakebuilder_cfg_SRCS} )
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
project(makebuilder)
|
||||
add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9037 )
|
||||
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
||||
set(kdevmakebuilder_LIB_SRCS
|
||||
|
|
@ -26,14 +24,9 @@ install(TARGETS kdevmakebuilder DESTINATION ${PLUGIN_INSTALL_DIR} )
|
|||
|
||||
set( makebuilder_cfg_SRCS
|
||||
makebuilderpreferences.cpp
|
||||
)
|
||||
|
||||
set( makebuilder_cfg_UI
|
||||
makeconfig.ui
|
||||
)
|
||||
|
||||
|
||||
kde4_add_ui_files( makebuilder_cfg_SRCS ${makebuilder_cfg_UI} )
|
||||
kde4_add_kcfg_files( makebuilder_cfg_SRCS makebuilderconfig.kcfgc )
|
||||
kde4_add_plugin( kcm_kdev_makebuilder ${makebuilder_cfg_SRCS} )
|
||||
target_link_libraries( kcm_kdev_makebuilder ${KDE4_KIO_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES} )
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@ install(TARGETS kdevninja DESTINATION ${PLUGIN_INSTALL_DIR})
|
|||
|
||||
########### configurator ##############
|
||||
|
||||
kde4_add_ui_files(ninjabuilder_cfg_SRCS ninjaconfig.ui)
|
||||
kde4_add_kcfg_files(ninjabuilder_cfg_SRCS ninjabuilderconfig.kcfgc)
|
||||
kde4_add_plugin(kcm_kdev_ninjabuilder ninjabuilderpreferences.cpp ${ninjabuilder_cfg_SRCS})
|
||||
target_link_libraries(kcm_kdev_ninjabuilder
|
||||
${KDE4_KIO_LIBS}
|
||||
${KDEVPLATFORM_INTERFACES_LIBRARIES}
|
||||
${KDEVPLATFORM_PROJECT_LIBRARIES}
|
||||
${KDEVPLATFORM_UTIL_LIBRARIES})
|
||||
${KDE4_KIO_LIBS}
|
||||
${KDEVPLATFORM_INTERFACES_LIBRARIES}
|
||||
${KDEVPLATFORM_PROJECT_LIBRARIES}
|
||||
${KDEVPLATFORM_UTIL_LIBRARIES}
|
||||
)
|
||||
|
||||
install(TARGETS kcm_kdev_ninjabuilder DESTINATION ${PLUGIN_INSTALL_DIR})
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
project(cmakemanager)
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/parser)
|
||||
|
||||
add_subdirectory(tests)
|
||||
if(ENABLE_TESTING)
|
||||
add_subdirectory(tests)
|
||||
endif()
|
||||
add_subdirectory(icons)
|
||||
|
||||
# enable this if you want to have the cmake debug visitor run on each CMakeLists.txt
|
||||
|
|
@ -27,10 +29,6 @@ set( cmakecommon_SRCS
|
|||
cmakeutils.cpp
|
||||
cmakebuilddirchooser.cpp
|
||||
cmakemodelitems.cpp
|
||||
|
||||
)
|
||||
|
||||
set( cmakecommon_UI
|
||||
cmakebuilddirchooser.ui
|
||||
)
|
||||
|
||||
|
|
@ -46,9 +44,6 @@ set( cmakemanager_SRCS
|
|||
cmakecommitchangesjob.cpp
|
||||
cmakeimportjob.cpp
|
||||
cmakeedit.cpp
|
||||
)
|
||||
|
||||
set( cmakemanager_UI
|
||||
cmakepossibleroots.ui
|
||||
)
|
||||
|
||||
|
|
@ -56,9 +51,6 @@ set( cmakesettings_SRCS
|
|||
settings/cmakepreferences.cpp
|
||||
settings/cmakecachemodel.cpp
|
||||
settings/cmakecachedelegate.cpp
|
||||
)
|
||||
|
||||
set( cmakesettings_UI
|
||||
settings/cmakebuildsettings.ui
|
||||
)
|
||||
|
||||
|
|
@ -73,20 +65,18 @@ remove_definitions( -DQT_NO_STL )
|
|||
# Its only purpose is to support the plugin without needing to add all source files
|
||||
# to the plugin target
|
||||
|
||||
kde4_add_ui_files( cmakecommon_SRCS ${cmakecommon_UI} )
|
||||
add_library( kdev4cmakecommon SHARED ${cmakecommon_SRCS} )
|
||||
target_link_libraries( kdev4cmakecommon LINK_PRIVATE ${KDE4_KDEUI_LIBS}
|
||||
${KDE4_KTEXTEDITOR_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES}
|
||||
${QT_QTSCRIPT_LIBRARY} ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
|
||||
)
|
||||
|
||||
kde4_add_ui_files( cmakemanager_SRCS ${cmakemanager_UI} )
|
||||
kde4_add_plugin( kdevcmakemanager ${cmakemanager_SRCS} )
|
||||
target_link_libraries( kdevcmakemanager ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDEVPLATFORM_UTIL_LIBRARIES}
|
||||
${KDEVPLATFORM_INTERFACES_LIBRARIES} kdev4cmakecommon
|
||||
${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
|
||||
${KDEVPLATFORM_OUTPUTVIEW_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS})
|
||||
|
||||
|
||||
kde4_add_plugin( kdevcmakedocumentation ${cmakedoc_SRCS} )
|
||||
target_link_libraries( kdevcmakedocumentation
|
||||
${KDEVPLATFORM_INTERFACES_LIBRARIES} kdev4cmakecommon
|
||||
|
|
@ -94,7 +84,6 @@ target_link_libraries( kdevcmakedocumentation
|
|||
${KDEVPLATFORM_DOCUMENTATION_LIBRARIES}
|
||||
${KDE4_KTEXTEDITOR_LIBS} ${QT_QTWEBKIT_LIBRARY})
|
||||
|
||||
kde4_add_ui_files( cmakesettings_SRCS ${cmakesettings_UI} )
|
||||
kde4_add_plugin( kcm_kdevcmake_settings ${cmakesettings_SRCS} )
|
||||
target_link_libraries( kcm_kdevcmake_settings ${KDE4_KIO_LIBS}
|
||||
${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
#include <KDebug>
|
||||
#include <KProcess>
|
||||
#include <KMessageBox>
|
||||
#include <KLocale>
|
||||
#include <KStandardDirs>
|
||||
#include "ui_cmakebuilddirchooser.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
#include <kpluginloader.h>
|
||||
#include <KUrl>
|
||||
#include <KMessageBox>
|
||||
#include <KLocale>
|
||||
#include <kio/netaccess.h>
|
||||
#include <kio/deletejob.h>
|
||||
#include <KDebug>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@ include_directories( ${KDE4_INCLUDES} ${KDEVPLATFORM_INCLUDE_DIR})
|
|||
add_definitions( ${QT_DEFINITIONS} ${KDE4_DEFINITIONS} )
|
||||
|
||||
## Unittests
|
||||
add_subdirectory( tests )
|
||||
if(ENABLE_TESTING)
|
||||
add_subdirectory(tests)
|
||||
endif()
|
||||
|
||||
## KDevelop Plugin
|
||||
set( custom_SRCS custombuildsystemplugin.cpp custombuildjob.cpp )
|
||||
|
|
@ -25,11 +27,9 @@ set( custom_kcm_SRCS
|
|||
custombuildsystemconfigwidget.cpp
|
||||
kcm_custombuildsystem.cpp
|
||||
debugarea.cpp
|
||||
)
|
||||
kde4_add_ui_files( custom_kcm_SRCS
|
||||
configwidget.ui
|
||||
custombuildsystemconfigwidget.ui
|
||||
)
|
||||
configwidget.ui
|
||||
custombuildsystemconfigwidget.ui
|
||||
)
|
||||
kde4_add_kcfg_files( custom_kcm_SRCS kcfg_custombuildsystemconfig.kcfgc )
|
||||
kde4_add_plugin( kcm_kdevcustombuildsystem ${custom_kcm_SRCS} )
|
||||
target_link_libraries( kcm_kdevcustombuildsystem ${KDE4_KIO_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES} )
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
#include <KDebug>
|
||||
#include <KLineEdit>
|
||||
#include <KAction>
|
||||
#include <KLocale>
|
||||
|
||||
#include "ui_configwidget.h"
|
||||
#include <util/environmentgrouplist.h>
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
* along with this program; if not, see <http://www.gnu.org/licenses/>. *
|
||||
************************************************************************/
|
||||
|
||||
#include "custombuildsystemconfigwidget.h"
|
||||
|
||||
#include <KConfig>
|
||||
#include <KConfigGroup>
|
||||
|
||||
#include "custombuildsystemconfigwidget.h"
|
||||
#include "ui_custombuildsystemconfigwidget.h"
|
||||
#include "configconstants.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -15,9 +15,6 @@ set(KDEVPLATFORM_LIB_SOVERSION 8)
|
|||
cmake_minimum_required(VERSION 2.8.9)
|
||||
project(KDevPlatform)
|
||||
|
||||
# FIXME: tests are broken
|
||||
set(ENABLE_TESTING OFF)
|
||||
|
||||
set(CMAKE_MODULE_PATH ${KDevPlatform_SOURCE_DIR}/cmake/modules)
|
||||
|
||||
set(KDE_MIN_VERSION "4.7.0")
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue