[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: [kactivities] /: Don't look for nepomuk-core in several places and also look for Nepomuk.
From:       Sebastian Trüg <sebastian () trueg ! de>
Date:       2012-08-15 7:55:42
Message-ID: 502B55FE.4020403 () trueg ! de
[Download RAW message or body]

Why do you need both nepomuk-core and libnepomuk?

On 08/13/2012 10:46 PM, Christophe Giboudeaux wrote:
> Git commit 42c50297d594b19db8e624baaf0013686b6cf18b by Christophe Giboudeaux.
> Committed on 13/08/2012 at 22:42.
> Pushed by cgiboudeaux into branch 'master'.
> 
> Don't look for nepomuk-core in several places and also look for Nepomuk.
> 
> M  +12   -0    CMakeLists.txt
> M  +1    -11   src/service/CMakeLists.txt
> M  +1    -1    src/service/plugins/sqlite/CMakeLists.txt
> M  +0    -4    src/workspace/CMakeLists.txt
> 
> http://commits.kde.org/kactivities/42c50297d594b19db8e624baaf0013686b6cf18b
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index cd46017..874c206 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -7,6 +7,18 @@ INCLUDE(MacroLibrary)
> INCLUDE(MacroOptionalAddSubdirectory)
> INCLUDE(FindPackageHandleStandardArgs)
> 
> +# Checking for Nepomuk
> +MACRO_OPTIONAL_FIND_PACKAGE(NepomukCore)
> +MACRO_LOG_FEATURE(NepomukCore_FOUND
> +    "Nepomuk Core" "Nepomuk Core" "https://projects.kde.org/nepomuk-core" FALSE ""
> +    "STRONGLY_RECOMMENDED: Nepomuk is needed for some activity-related info"
> +    )
> +
> +IF(NepomukCore_FOUND)
> +    FIND_PACKAGE(Nepomuk)
> +    MACRO_LOG_FEATURE(Nepomuk_FOUND "Nepomuk" "The Nepomuk libraries" \
> "http://www.kde.org" TRUE "" "The Nepomuk libraries are required for some \
> activities related functionalities") +ENDIF()
> +
> set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules \
> ${CMAKE_MODULE_PATH}) 
> add_subdirectory(src)
> diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
> index 881f68e..bfcbce5 100644
> --- a/src/service/CMakeLists.txt
> +++ b/src/service/CMakeLists.txt
> @@ -14,21 +14,11 @@ endif ()
> 
> set (ADDITIONAL_LINK_LIBS)
> 
> -# Checking for Nepomuk
> -
> -macro_optional_find_package (NepomukCore)
> -macro_log_feature (NepomukCore_FOUND
> -    "Nepomuk Core" "Nepomuk Core" \
>                 "https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" FALSE \
>                 ""
> -    "STRONGLY_RECOMMENDED: Nepomuk is needed for some activity-related info"
> -    )
> -
> set (sdo_SRCS)
> 
> -if (NepomukCore_FOUND)
> +if (NepomukCore_FOUND AND Nepomuk_FOUND)
> set (HAVE_NEPOMUK 1)
> 
> -    find_package (Soprano)
> -
> include_directories (${NEPOMUK_INCLUDE_DIRS})
> 
> set (ADDITIONAL_LINK_LIBS
> diff --git a/src/service/plugins/sqlite/CMakeLists.txt \
> b/src/service/plugins/sqlite/CMakeLists.txt index 7a56407..e4fb783 100644
> --- a/src/service/plugins/sqlite/CMakeLists.txt
> +++ b/src/service/plugins/sqlite/CMakeLists.txt
> @@ -18,7 +18,7 @@ qt4_add_dbus_adaptor(
> )
> 
> if(NepomukCore_FOUND)
> -    include_directories(${NEPOMUK_INCLUDE_DIR} ${SOPRANO_INCLUDE_DIR})
> +    include_directories(${NEPOMUK_INCLUDE_DIRS})
> 
> soprano_add_ontology(sqliteplugin_SRCS
> ${CMAKE_SOURCE_DIR}/src/ontologies/kao.trig
> diff --git a/src/workspace/CMakeLists.txt b/src/workspace/CMakeLists.txt
> index d9cb9d3..d51543f 100644
> --- a/src/workspace/CMakeLists.txt
> +++ b/src/workspace/CMakeLists.txt
> @@ -1,7 +1,3 @@
> -macro_optional_find_package(NepomukCore)
> -macro_log_feature (NepomukCore_FOUND
> -    "Nepomuk Core" "Nepomuk Core" \
>                 "https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" FALSE \
>                 ""
> -    "STRONGLY_RECOMMENDED: Nepomuk is needed for the activities KIO slave and \
> linking files to activities") 
> set(sdo_SRCS "")
> 
> 
> 


[prev in list] [next in list] [prev in thread] [next in thread]