Git commit ca1e53f9db92128cff777418c52d89dd169404e9 by Andreas Pakulat. Committed on 07/04/2015 at 18:45. Pushed by apaku into branch '1.7'. Do not report subversion as being not found when it actually was The feature summary requires a _FOUND variable that is named exactly as the package that is being looked up. In this case KDevelop uses SubversionLibrary but the variable it set was SUBVERSION_FOUND. Hence feature_summary thought the package was not found and reported that even if all subversion libraries/includes have been solved. Conflicts: plugins/CMakeLists.txt M +13 -14 cmake/modules/FindSubversionLibrary.cmake M +2 -2 plugins/CMakeLists.txt http://commits.kde.org/kdevplatform/ca1e53f9db92128cff777418c52d89dd169404e9 diff --git a/cmake/modules/FindSubversionLibrary.cmake b/cmake/modules/Find= SubversionLibrary.cmake index 77b7359..96521dc 100644 --- a/cmake/modules/FindSubversionLibrary.cmake +++ b/cmake/modules/FindSubversionLibrary.cmake @@ -7,7 +7,7 @@ # APU_CONFIG_PATH - path where apu-config or apu-1-config are located # # The variables set by this macro are: -# SUBVERSION_FOUND - system has subversion libraries +# SubversionLibrary_FOUND - system has subversion libraries # SUBVERSION_INCLUDE_DIRS - the include directories to link to subversion # SUBVERSION_LIBRARIES - The libraries needed to link to subversion # Copyright (c) 2009 Lambert CLARA @@ -74,7 +74,7 @@ IF (NOT WIN32) = IF(NOT APR_CONFIG) MESSAGE(STATUS "no apr-config found, subversion support will be di= sabled") - SET(SUBVERSION_FOUND false) + SET(SubversionLibrary_FOUND false) ELSE(NOT APR_CONFIG) EXEC_PROGRAM(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APR= _INCLUDE_DIR) STRING(REPLACE "-I" "" APR_INCLUDE_DIR ${APR_INCLUDE_DIR}) @@ -100,7 +100,7 @@ IF (NOT WIN32) = IF(NOT APU_CONFIG) MESSAGE(STATUS "no apu-config found, subversion support will be di= sabled") - SET(SUBVERSION_FOUND false) + SET(SubversionLibrary_FOUND false) ELSE(NOT APU_CONFIG) EXEC_PROGRAM(${APU_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APU= _INCLUDE_DIR) STRING(REPLACE "-I" "" APU_INCLUDE_DIR ${APU_INCLUDE_DIR}) @@ -330,12 +330,12 @@ ENDIF (NOT WIN32) = IF(NOT SUBVERSION_INCLUDE_DIR) MESSAGE(STATUS "No subversion includes found, subversion support will be= disabled") - SET(SUBVERSION_FOUND false) + SET(SubversionLibrary_FOUND false) ELSE(NOT SUBVERSION_INCLUDE_DIR) IF(NOT Subversion_FIND_QUIETLY) MESSAGE(STATUS "Found subversion include: ${SUBVERSION_INCLUDE_DIR}") ENDIF(NOT Subversion_FIND_QUIETLY) - SET(SUBVERSION_FOUND true) + SET(SubversionLibrary_FOUND true) SET(SUBVERSION_INCLUDE_DIRS ${SUBVERSION_INCLUDE_DIR}) ENDIF(NOT SUBVERSION_INCLUDE_DIR) = @@ -361,7 +361,7 @@ ENDIF(NOT APU_INCLUDE_DIR) = IF (NOT SUBVERSION_CLIENTLIB) MESSAGE(STATUS "No subversion client libs found, subversion support will= be disabled") - SET(SUBVERSION_FOUND false) + SET(SubversionLibrary_FOUND false) ELSE (NOT SUBVERSION_CLIENTLIB) IF(NOT Subversion_FIND_QUIETLY) MESSAGE(STATUS "Found subversion client lib: ${SUBVERSION_CLIENTLIB}") @@ -371,7 +371,7 @@ ENDIF(NOT SUBVERSION_CLIENTLIB) = IF (NOT SUBVERSION_REPOSITORYLIB) MESSAGE(STATUS "No subversion repository lib found, subversion support w= ill be disabled") - SET(SUBVERSION_FOUND false) + SET(SubversionLibrary_FOUND false) ELSE (NOT SUBVERSION_REPOSITORYLIB) IF(NOT Subversion_FIND_QUIETLY) MESSAGE(STATUS "Found subversion repository lib: ${SUBVERSION_REPOSITO= RYLIB}") @@ -381,7 +381,7 @@ ENDIF(NOT SUBVERSION_REPOSITORYLIB) = IF (NOT SUBVERSION_FSLIB) MESSAGE(STATUS "No subversion fs lib found, subversion support will be d= isabled") - SET(SUBVERSION_FOUND false) + SET(SubversionLibrary_FOUND false) ELSE (NOT SUBVERSION_FSLIB) IF(NOT Subversion_FIND_QUIETLY) MESSAGE(STATUS "Found subversion fs lib: ${SUBVERSION_FSLIB}") @@ -391,7 +391,7 @@ ENDIF(NOT SUBVERSION_FSLIB) = IF (NOT SUBVERSION_SUBRLIB) MESSAGE(STATUS "No subversion subr lib found, subversion support will be= disabled") - SET(SUBVERSION_FOUND false) + SET(SubversionLibrary_FOUND false) ELSE (NOT SUBVERSION_SUBRLIB) IF(NOT Subversion_FIND_QUIETLY) MESSAGE(STATUS "Found subversion subr lib: ${SUBVERSION_SUBRLIB}") @@ -401,7 +401,7 @@ ENDIF(NOT SUBVERSION_SUBRLIB) = IF (NOT SUBVERSION_WCLIB) MESSAGE(STATUS "No subversion wc lib found, subversion support will be d= isabled") - SET(SUBVERSION_FOUND false) + SET(SubversionLibrary_FOUND false) ELSE (NOT SUBVERSION_WCLIB) IF(NOT Subversion_FIND_QUIETLY) MESSAGE(STATUS "Found subversion wc lib: ${SUBVERSION_WCLIB}") @@ -411,7 +411,7 @@ ENDIF(NOT SUBVERSION_WCLIB) = IF (NOT SUBVERSION_RALIB) MESSAGE(STATUS "No subversion ra lib found, subversion support will be d= isabled") - SET(SUBVERSION_FOUND false) + SET(SubversionLibrary_FOUND false) ELSE (NOT SUBVERSION_RALIB) IF(NOT Subversion_FIND_QUIETLY) MESSAGE(STATUS "Found subversion ra lib: ${SUBVERSION_RALIB}") @@ -421,7 +421,7 @@ ENDIF(NOT SUBVERSION_RALIB) = IF (NOT APR_LIBRARY) MESSAGE(STATUS "No apr lib found, subversion support will be disabled") - SET(SUBVERSION_FOUND false) + SET(SubversionLibrary_FOUND false) ELSE (NOT APR_LIBRARY) IF(NOT Subversion_FIND_QUIETLY) MESSAGE(STATUS "Found apr lib: ${APR_LIBRARY}") @@ -431,7 +431,7 @@ ENDIF(NOT APR_LIBRARY) = IF (NOT APU_LIBRARY) MESSAGE(STATUS "No apu lib found, subversion support will be disabled") - SET(SUBVERSION_FOUND false) + SET(SubversionLibrary_FOUND false) ELSE (NOT APU_LIBRARY) IF(NOT Subversion_FIND_QUIETLY) MESSAGE(STATUS "Found apu lib: ${APU_LIBRARY}") @@ -459,5 +459,4 @@ MARK_AS_ADVANCED( APU_LIBRARY ) = - #kate: space-indent on; indent-width 2; tab-width: 2; replace-tabs on; aut= o-insert-doxygen on diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 7be6721..8d58b48 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -40,9 +40,9 @@ endif(Boost_FOUND) find_package(SubversionLibrary) macro_log_feature( SUBVERSION_FOUND "Subversion" "Support for Subversion i= ntegration" "http://subversion.tigris.org" FALSE "1.3.0" "The subversion li= braries are needed for the Subversion support" ) = -if(SUBVERSION_FOUND) +if(SubversionLibrary_FOUND) macro_optional_add_subdirectory(subversion) -endif(SUBVERSION_FOUND) +endif(SubversionLibrary_FOUND) = if(QJSON_FOUND) macro_optional_add_subdirectory(reviewboard)