SVN commit 1079795 by mmrozowski: Forward port of #1079793 (Fix typo breaking KDELibsDependenciesFile.cmake. Also rearrange linebreaks to make it look nicer.)
Synchronize with 4.4 branch (to get cache string), also fix some spelling in comments. CCMAIL: [email protected] M +11 -9 CreateKDELibsDependenciesFile.cmake --- trunk/KDE/kdelibs/CreateKDELibsDependenciesFile.cmake #1079794:1079795 @@ -3,9 +3,9 @@ ######## write dependency file which will be installed ######### -# write the versions +# write versions -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake "# this file was generated during the kdelibs build process set(KDE_VERSION_MAJOR ${KDE_VERSION_MAJOR}) set(KDE_VERSION_MINOR ${KDE_VERSION_MINOR}) @@ -15,11 +15,11 @@ set(KDE_DEFAULT_HOME \"${KDE_DEFAULT_HOME}\") ") -# write the installdirs +# write installdirs # we need the absolute directories where stuff will be installed too # but since the variables which contain the destinations can be relative -# or absolute paths, we need this macro to make them all absoulte, Alex +# or absolute paths, we need this macro to make them all absolute, Alex macro(MAKE_INSTALL_PATH_ABSOLUTE out in) if (IS_ABSOLUTE "${in}") # IS_ABSOLUTE is new since cmake 2.4.8 set(${out} "${in}") @@ -90,10 +90,10 @@ set(KDE4_TARGET_PREFIX ${KDE4_TARGET_PREFIX} ) -\n") +") -# write the library dependencies +# write library dependencies if (WIN32) file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake" @@ -101,9 +101,9 @@ set (QT_INSTALL_DIR \"${QT_INSTALL_DIR}\") endif (NOT QT_INSTALL_DIR) ") - # replace hard codes paths by variables + # replace hard coded paths by variables # !!! the following stuff does not work because export_library_dependencies - # !!! does not wait until the file is written completly + # !!! does not wait until the file is written completely # export_library_dependencies(${CMAKE_BINARY_DIR}/tmpdeps.cmake) # file(READ ${CMAKE_BINARY_DIR}/tmpdeps.cmake _deps) # string(REPLACE "${QT_INSTALL_DIR}" "\${QT_INSTALL_DIR}" __deps "${_deps}") @@ -118,5 +118,7 @@ # Append stuff needed by the KAuth framework file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake" " + set(KDE4_AUTH_BACKEND_NAME \"${KDE4_AUTH_BACKEND_NAME}\") -set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR \"${KDE4_AUTH_POLICY_FILES_INSTALL_DIR}\") \n") +set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR \"${KDE4_AUTH_POLICY_FILES_INSTALL_DIR}\" CACHE STRING \"The location where policy files generated by KAuth will be installed, if the installed backend needs to\") +") _______________________________________________ Kde-buildsystem mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-buildsystem
