On 19.10.09 18:47:45, Alexander Neundorf wrote: > On Sunday 18 October 2009, Andreas Pakulat wrote: > > On 17.10.09 16:20:11, Andreas Pakulat wrote: > > - copy the find-module to kdelibs/trunk and kdevelop/trunk so we have a > > duplicate until kdevelop depends on KDE 4.4. I don't like the > > duplicate-part obviously.. > > - Move the file to kdelibs/trunk and make kdevelop depend on KDE 4.4. > > Thats going to frustrate quite some users. > > - Copy the file to kdelibs/trunk and leave it in kdevplatform until we > > require KDE 4.4. This is going to create a file conflict for > > distributions, so not very nice either. > > > > Did I miss one that works better than option 2? Else I'll do that one. > > Yes, I think I would prefer that one too.
Ok, thats going to be the one I'm taking. > Could you please also post the cmake files installed by kdevplatform (which > are found by this one here) ? Sure, attached are the .cmake ones and the final generated ones as well (from my system). Andreas -- You will have domestic happiness and faithful friends.
######################################################################### # # KDevPlatform Configuration File # # This file sets various CMake Variables # # KDEVPLATFORM_INCLUDE_DIR - The Include Directory for all KDEVPLATFORM libraries # KDEVPLATFORM_INTERFACES_LIBRARY - the interfaces library # KDEVPLATFORM_LANGUAGE_LIBRARY - the language library # KDEVPLATFORM_OUTPUTVIEW_LIBRARY - the outputview library # KDEVPLATFORM_PROJECT_LIBRARY - the project library # KDEVPLATFORM_SUBLIME_LIBRARY - the sublime library # KDEVPLATFORM_SHELL_LIBRARY - the shell library # KDEVPLATFORM_TESTS_LIBRARY - the tests library # KDEVPLATFORM_UTIL_LIBRARY - the util library # KDEVPLATFORM_VCS_LIBRARY - the vcs library # KDEVPLATFORM_SOURCEFORMATTER_LIBRARY - the sourceformatter library # KDEVPLATFORM_DEBUGGER_LIBRARY - debugger module library # # Copyright 2008 Andreas Pakulat <ap...@gmx.de> # Redistribution and use is allowed according to the terms of the BSD license. ###################################################################### get_filename_component(_KDEVPLATFORM_CURRENT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) if(NOT WIN32) # This is needed on non-win32 platforms, as lib-install-dir might be in a # totally different prefix than include-install-dir. So instead hardcode the # absolute path during buildtime set( KDEVPLATFORM_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@/kdevplatform" ) else(NOT WIN32) set( KDEVPLATFORM_INCLUDE_DIR "${_KDEVPLATFORM_CURRENT_DIR}/../../../include/kdevplatform" ) endif(NOT WIN32) if( NOT TARGET kdevplatforminterfaces ) include("${_KDEVPLATFORM_CURRENT_DIR}/KDevPlatformTargets.cmake") endif( NOT TARGET kdevplatforminterfaces ) macro( _kdevplatform_set_lib_vars _prefix _lib ) set( KDEVPLATFORM_${_prefix}_LIBRARY ${_lib} ) endmacro( _kdevplatform_set_lib_vars ) _kdevplatform_set_lib_vars( INTERFACES kdevplatforminterfaces ) _kdevplatform_set_lib_vars( PROJECT kdevplatformproject ) _kdevplatform_set_lib_vars( LANGUAGE kdevplatformlanguage ) _kdevplatform_set_lib_vars( UTIL kdevplatformutil ) _kdevplatform_set_lib_vars( SHELL kdevplatformshell ) _kdevplatform_set_lib_vars( SUBLIME sublime ) _kdevplatform_set_lib_vars( VCS kdevplatformvcs ) _kdevplatform_set_lib_vars( OUTPUTVIEW kdevplatformoutputview ) _kdevplatform_set_lib_vars( SOURCEFORMATTER kdevplatformsourceformatter ) _kdevplatform_set_lib_vars( DEBUGGER kdevplatformdebugger ) _kdevplatform_set_lib_vars( TESTS kdevplatformtests ) include(${_KDEVPLATFORM_CURRENT_DIR}/KDevPlatformMacros.cmake) mark_as_advanced( KDEVPLATFORM_INTERFACES_LIBRARY KDEVPLATFORM_LANGUAGE_LIBRARY KDEVPLATFORM_OUTPUTVIEW_LIBRARY KDEVPLATFORM_PROJECT_LIBRARY KDEVPLATFORM_SUBLIME_LIBRARY KDEVPLATFORM_SHELL_LIBRARY KDEVPLATFORM_UTIL_LIBRARY KDEVPLATFORM_VCS_LIBRARY KDEVPLATFORM_SOURCEFORMATTER_LIBRARY KDEVPLATFORM_DEBUGGER_LIBRARY KDEVPLATFORM_TESTS_LIBRARY )
######################################################################### # # KDevPlatform Configuration File # # This file sets various CMake Variables # # KDEVPLATFORM_INCLUDE_DIR - The Include Directory for all KDEVPLATFORM libraries # KDEVPLATFORM_INTERFACES_LIBRARY - the interfaces library # KDEVPLATFORM_LANGUAGE_LIBRARY - the language library # KDEVPLATFORM_OUTPUTVIEW_LIBRARY - the outputview library # KDEVPLATFORM_PROJECT_LIBRARY - the project library # KDEVPLATFORM_SUBLIME_LIBRARY - the sublime library # KDEVPLATFORM_SHELL_LIBRARY - the shell library # KDEVPLATFORM_TESTS_LIBRARY - the tests library # KDEVPLATFORM_UTIL_LIBRARY - the util library # KDEVPLATFORM_VCS_LIBRARY - the vcs library # KDEVPLATFORM_SOURCEFORMATTER_LIBRARY - the sourceformatter library # KDEVPLATFORM_DEBUGGER_LIBRARY - debugger module library # # Copyright 2008 Andreas Pakulat <ap...@gmx.de> # Redistribution and use is allowed according to the terms of the BSD license. ###################################################################### get_filename_component(_KDEVPLATFORM_CURRENT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) if(NOT WIN32) # This is needed on non-win32 platforms, as lib-install-dir might be in a # totally different prefix than include-install-dir. So instead hardcode the # absolute path during buildtime set( KDEVPLATFORM_INCLUDE_DIR "/usr/local/include/kdevplatform" ) else(NOT WIN32) set( KDEVPLATFORM_INCLUDE_DIR "${_KDEVPLATFORM_CURRENT_DIR}/../../../include/kdevplatform" ) endif(NOT WIN32) if( NOT TARGET kdevplatforminterfaces ) include("${_KDEVPLATFORM_CURRENT_DIR}/KDevPlatformTargets.cmake") endif( NOT TARGET kdevplatforminterfaces ) macro( _kdevplatform_set_lib_vars _prefix _lib ) set( KDEVPLATFORM_${_prefix}_LIBRARY ${_lib} ) endmacro( _kdevplatform_set_lib_vars ) _kdevplatform_set_lib_vars( INTERFACES kdevplatforminterfaces ) _kdevplatform_set_lib_vars( PROJECT kdevplatformproject ) _kdevplatform_set_lib_vars( LANGUAGE kdevplatformlanguage ) _kdevplatform_set_lib_vars( UTIL kdevplatformutil ) _kdevplatform_set_lib_vars( SHELL kdevplatformshell ) _kdevplatform_set_lib_vars( SUBLIME sublime ) _kdevplatform_set_lib_vars( VCS kdevplatformvcs ) _kdevplatform_set_lib_vars( OUTPUTVIEW kdevplatformoutputview ) _kdevplatform_set_lib_vars( SOURCEFORMATTER kdevplatformsourceformatter ) _kdevplatform_set_lib_vars( DEBUGGER kdevplatformdebugger ) _kdevplatform_set_lib_vars( TESTS kdevplatformtests ) include(${_KDEVPLATFORM_CURRENT_DIR}/KDevPlatformMacros.cmake) mark_as_advanced( KDEVPLATFORM_INTERFACES_LIBRARY KDEVPLATFORM_LANGUAGE_LIBRARY KDEVPLATFORM_OUTPUTVIEW_LIBRARY KDEVPLATFORM_PROJECT_LIBRARY KDEVPLATFORM_SUBLIME_LIBRARY KDEVPLATFORM_SHELL_LIBRARY KDEVPLATFORM_UTIL_LIBRARY KDEVPLATFORM_VCS_LIBRARY KDEVPLATFORM_SOURCEFORMATTER_LIBRARY KDEVPLATFORM_DEBUGGER_LIBRARY KDEVPLATFORM_TESTS_LIBRARY )
# This is a very basic file for the new style find_package() search mode, # i.e. Config-mode. It is used by MACRO_WRITE_BASIC_CMAKE_VERSION_FILE() from # MacroWriteBasicCMakeVersionFile.cmake. # In this mode find_package() searches for a <package>Config.cmake # file and an associated <package>Version.cmake file, which it loads to check # the version number. # This file can be used with configure_file() to generate such a file for a project # with very basic logic. # It sets PACKAGE_VERSION_EXACT if the current version string and the requested # version string are exactly the same and it sets PACKAGE_VERSION_COMPATIBLE # if the current version is >= requested version. # If this is not good enough for your project, you need to write your own # improved <package>Version.cmake file. # This file requires the following three variables to be set: # PROJECT_VERSION_MAJOR # PROJECT_VERSION_MINOR # PROJECT_VERSION_PATCH set(PACKAGE_VERSION 0.9.96) if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" ) set(PACKAGE_VERSION_COMPATIBLE FALSE) else("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" ) set(PACKAGE_VERSION_COMPATIBLE TRUE) if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}") set(PACKAGE_VERSION_EXACT TRUE) endif( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}") endif("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
# # KDevelop Platform Macros # # The following macros are defined here: # # KDEVPLATFORM_ADD_APP_TEMPLATES( template1 ... templateN ) # Use this to get packaged template archives for the given templates. # Parameters should be the directories containing the templates. # # KDEVPLATFORM_INSTALL_KROSSPLUGIN( desktopfile subdir ) # Use this macro to install a kross plugin contained within subdir and # the desktopfile for loading it # # Copyright 2007 Andreas Pakulat <ap...@gmx.de> # Redistribution and use is allowed according to the terms of the BSD license. # package and install the given directories as application templates macro(kdevplatform_add_app_templates _templateNames) foreach(_templateName ${ARGV}) get_filename_component(_tmp_file ${_templateName} ABSOLUTE) get_filename_component(_baseName ${_tmp_file} NAME_WE) if(WIN32) set(_template ${CMAKE_CURRENT_BINARY_DIR}/${_baseName}.zip) else(WIN32) set(_template ${CMAKE_CURRENT_BINARY_DIR}/${_baseName}.tar.bz2) endif(WIN32) file(GLOB _files "${CMAKE_CURRENT_SOURCE_DIR}/${_templateName}/*") set(_deps) foreach(_file ${_files}) get_filename_component(_fileName ${_file} NAME) string(COMPARE NOTEQUAL ${_fileName} .kdev_ignore _v1) string(REGEX MATCH "\\.svn" _v2 ${_fileName} ) if(WIN32) string(REGEX MATCH "_svn" _v3 ${_fileName} ) else(WIN32) set(_v3 FALSE) endif(WIN32) if ( _v1 AND NOT _v2 AND NOT _v3 ) set(_deps ${_deps} ${_file}) endif ( _v1 AND NOT _v2 AND NOT _v3 ) endforeach(_file) add_custom_target(${_baseName} ALL DEPENDS ${_template}) if(WIN32) add_custom_command(OUTPUT ${_template} COMMAND zip ARGS -r ${_template} . -x .svn _svn .kdev_ignore WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_templateName} DEPENDS ${_deps} ) else(WIN32) add_custom_command(OUTPUT ${_template} COMMAND tar ARGS -c -C ${CMAKE_CURRENT_SOURCE_DIR}/${_templateName} --exclude .kdev_ignore --exclude .svn -j -f ${_template} . DEPENDS ${_deps} ) endif(WIN32) #install( FILES ${_templateName}/${_templateName}.kdevtemplate # DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) #install( FILES ${_templateName}/${_templateName}.png # DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES ${_template} DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) macro_additional_clean_files(${_template}) endforeach(_templateName) endmacro(kdevplatform_add_app_templates) macro(kdevplatform_install_kross_plugin desktopfile subdir) install( FILES ${desktopfile} DESTINATION ${SERVICES_INSTALL_DIR} ) install( DIRECTORY ${subdir} DESTINATION ${DATA_INSTALL_DIR}/kdevkrossplugins ) endmacro(kdevplatform_install_kross_plugin)
# Generated by CMake 2.8.0-rc1 IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) MESSAGE(FATAL_ERROR "CMake >= 2.6.0 required") ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) CMAKE_POLICY(PUSH) CMAKE_POLICY(VERSION 2.6) #---------------------------------------------------------------- # Generated CMake target import file. #---------------------------------------------------------------- # Commands may need to know the format version. SET(CMAKE_IMPORT_FILE_VERSION 1) # Create imported target sublime ADD_LIBRARY(sublime SHARED IMPORTED) # Create imported target kdevplatforminterfaces ADD_LIBRARY(kdevplatforminterfaces SHARED IMPORTED) # Create imported target kdevplatformproject ADD_LIBRARY(kdevplatformproject SHARED IMPORTED) # Create imported target kdevplatformlanguage ADD_LIBRARY(kdevplatformlanguage SHARED IMPORTED) # Create imported target kdevplatformshell ADD_LIBRARY(kdevplatformshell SHARED IMPORTED) # Create imported target kdevplatformutil ADD_LIBRARY(kdevplatformutil SHARED IMPORTED) # Create imported target kdevplatformoutputview ADD_LIBRARY(kdevplatformoutputview SHARED IMPORTED) # Create imported target kdevplatformvcs ADD_LIBRARY(kdevplatformvcs SHARED IMPORTED) # Create imported target kdevplatformdebugger ADD_LIBRARY(kdevplatformdebugger SHARED IMPORTED) # Create imported target kdevplatformtests ADD_LIBRARY(kdevplatformtests SHARED IMPORTED) # Load information for each installed configuration. GET_FILENAME_COMPONENT(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) FILE(GLOB CONFIG_FILES "${_DIR}/KDevPlatformTargets-*.cmake") FOREACH(f ${CONFIG_FILES}) INCLUDE(${f}) ENDFOREACH(f) # Commands beyond this point should not need to know the version. SET(CMAKE_IMPORT_FILE_VERSION) CMAKE_POLICY(POP)
#---------------------------------------------------------------- # Generated CMake target import file for configuration "Debugfull". #---------------------------------------------------------------- # Commands may need to know the format version. SET(CMAKE_IMPORT_FILE_VERSION 1) # Import target "sublime" for configuration "Debugfull" SET_PROPERTY(TARGET sublime APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUGFULL) SET_TARGET_PROPERTIES(sublime PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUGFULL "KDE4__kdeui;KDE4__kparts" IMPORTED_LOCATION_DEBUGFULL "/usr/local/lib/libsublime.so.1.0.0" IMPORTED_SONAME_DEBUGFULL "libsublime.so.1" ) # Import target "kdevplatforminterfaces" for configuration "Debugfull" SET_PROPERTY(TARGET kdevplatforminterfaces APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUGFULL) SET_TARGET_PROPERTIES(kdevplatforminterfaces PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUGFULL "KDE4__kio;KDE4__kutils;KDE4__knotifyconfig;KDE4__threadweaver;KDE4__krosscore" IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUGFULL "KDE4__kparts;KDE4__ktexteditor;/usr/local/lib/libQtDesigner.so" IMPORTED_LOCATION_DEBUGFULL "/usr/local/lib/libkdevplatforminterfaces.so.1.0.0" IMPORTED_SONAME_DEBUGFULL "libkdevplatforminterfaces.so.1" ) # Import target "kdevplatformproject" for configuration "Debugfull" SET_PROPERTY(TARGET kdevplatformproject APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUGFULL) SET_TARGET_PROPERTIES(kdevplatformproject PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUGFULL "kdevplatforminterfaces;KDE4__kio" IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUGFULL "/usr/local/lib/libQtGui.so;KDE4__kdecore" IMPORTED_LOCATION_DEBUGFULL "/usr/local/lib/libkdevplatformproject.so.1.0.0" IMPORTED_SONAME_DEBUGFULL "libkdevplatformproject.so.1" ) # Import target "kdevplatformlanguage" for configuration "Debugfull" SET_PROPERTY(TARGET kdevplatformlanguage APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUGFULL) SET_TARGET_PROPERTIES(kdevplatformlanguage PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUGFULL "KDE4__kparts;kdevplatforminterfaces;kdevplatformutil" IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUGFULL "KDE4__ktexteditor;KDE4__threadweaver" IMPORTED_LOCATION_DEBUGFULL "/usr/local/lib/libkdevplatformlanguage.so.1.0.0" IMPORTED_SONAME_DEBUGFULL "libkdevplatformlanguage.so.1" ) # Import target "kdevplatformshell" for configuration "Debugfull" SET_PROPERTY(TARGET kdevplatformshell APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUGFULL) SET_TARGET_PROPERTIES(kdevplatformshell PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUGFULL "KDE4__kde3support;KDE4__kio;KDE4__kfile;KDE4__kutils;KDE4__kparts;KDE4__knotifyconfig;KDE4__ktexteditor;KDE4__threadweaver;KDE4__krosscore;kdevplatformproject;kdevplatformvcs;kdevplatformlanguage;sublime;kdevplatformutil;kdevplatformoutputview;kdevplatformdebugger" IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUGFULL "KDE4__kdeui;KDE4__kdecore;kdevplatforminterfaces" IMPORTED_LOCATION_DEBUGFULL "/usr/local/lib/libkdevplatformshell.so.1.0.0" IMPORTED_SONAME_DEBUGFULL "libkdevplatformshell.so.1" ) # Import target "kdevplatformutil" for configuration "Debugfull" SET_PROPERTY(TARGET kdevplatformutil APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUGFULL) SET_TARGET_PROPERTIES(kdevplatformutil PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUGFULL "kdevplatforminterfaces;kdevplatformoutputview;kdevplatformproject" IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUGFULL "KDE4__kdeui;KDE4__kutils" IMPORTED_LOCATION_DEBUGFULL "/usr/local/lib/libkdevplatformutil.so.1.0.0" IMPORTED_SONAME_DEBUGFULL "libkdevplatformutil.so.1" ) # Import target "kdevplatformoutputview" for configuration "Debugfull" SET_PROPERTY(TARGET kdevplatformoutputview APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUGFULL) SET_TARGET_PROPERTIES(kdevplatformoutputview PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUGFULL "kdevplatforminterfaces" IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUGFULL "/usr/local/lib/libQtCore.so;-lpthread;KDE4__kdeui" IMPORTED_LOCATION_DEBUGFULL "/usr/local/lib/libkdevplatformoutputview.so.1.0.0" IMPORTED_SONAME_DEBUGFULL "libkdevplatformoutputview.so.1" ) # Import target "kdevplatformvcs" for configuration "Debugfull" SET_PROPERTY(TARGET kdevplatformvcs APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUGFULL) SET_TARGET_PROPERTIES(kdevplatformvcs PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUGFULL "kdevplatforminterfaces;kdevplatformutil;kdevplatformproject;kdevplatformlanguage;kdevplatformoutputview" IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUGFULL "KDE4__kio;KDE4__kparts" IMPORTED_LOCATION_DEBUGFULL "/usr/local/lib/libkdevplatformvcs.so.1.0.0" IMPORTED_SONAME_DEBUGFULL "libkdevplatformvcs.so.1" ) # Import target "kdevplatformdebugger" for configuration "Debugfull" SET_PROPERTY(TARGET kdevplatformdebugger APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUGFULL) SET_TARGET_PROPERTIES(kdevplatformdebugger PROPERTIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUGFULL "kdevplatforminterfaces;kdevplatformutil;KDE4__kdeui;KDE4__ktexteditor" IMPORTED_LOCATION_DEBUGFULL "/usr/local/lib/libkdevplatformdebugger.so.1.0.0" IMPORTED_SONAME_DEBUGFULL "libkdevplatformdebugger.so.1" ) # Import target "kdevplatformtests" for configuration "Debugfull" SET_PROPERTY(TARGET kdevplatformtests APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUGFULL) SET_TARGET_PROPERTIES(kdevplatformtests PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUGFULL "/usr/local/lib/libQtCore.so;-lpthread;kdevplatformshell" IMPORTED_LOCATION_DEBUGFULL "/usr/local/lib/libkdevplatformtests.so.1.0.0" IMPORTED_SONAME_DEBUGFULL "libkdevplatformtests.so.1" ) # Commands beyond this point should not need to know the version. SET(CMAKE_IMPORT_FILE_VERSION)
_______________________________________________ Kde-buildsystem mailing list Kde-buildsystem@kde.org https://mail.kde.org/mailman/listinfo/kde-buildsystem