diff --git a/Makefile.am b/Makefile.am index 148be7f116..0e8d175f90 100644 --- a/Makefile.am +++ b/Makefile.am @@ -266,11 +266,26 @@ edje_cmakeconfig_DATA = \ cmakeconfig/EdjeConfig.cmake \ cmakeconfig/EdjeConfigVersion.cmake +eldbus_cmakeconfigdir = $(libdir)/cmake/Eldbus/ +eldbus_cmakeconfig_DATA = \ +cmakeconfig/EldbusConfig.cmake \ +cmakeconfig/EldbusConfigVersion.cmake + efreet_cmakeconfigdir = $(libdir)/cmake/Efreet/ efreet_cmakeconfig_DATA = \ cmakeconfig/EfreetConfig.cmake \ cmakeconfig/EfreetConfigVersion.cmake +ethumb_cmakeconfigdir = $(libdir)/cmake/Ethumb/ +ethumb_cmakeconfig_DATA = \ +cmakeconfig/EthumbConfig.cmake \ +cmakeconfig/EthumbConfigVersion.cmake + +ethumbclient_cmakeconfigdir = $(libdir)/cmake/EthumbClient/ +ethumbclient_cmakeconfig_DATA = \ +cmakeconfig/EthumbClientConfig.cmake \ +cmakeconfig/EthumbClientConfigVersion.cmake + # D-Bus services: servicedir = @dbusservicedir@ diff --git a/cmakeconfig/EldbusConfig.cmake.in b/cmakeconfig/EldbusConfig.cmake.in new file mode 100644 index 0000000000..ba10133c1b --- /dev/null +++ b/cmakeconfig/EldbusConfig.cmake.in @@ -0,0 +1,32 @@ +# - Try to find eldbus +# Once done this will define +# ELDBUS_FOUND - System has eldbus +# ELDBUS_INCLUDE_DIRS - The eldbus include directories +# ELDBUS_LIBRARIES - The libraries needed to use eldbus +# ELDBUS_DEFINITIONS - Compiler switches required for using eldbus + +set(MY_PKG eldbus) + +find_package(PkgConfig) +if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1") + # "QUIET" was introduced in 2.8.2 + set(_QUIET QUIET) +endif () +pkg_check_modules(PC_LIBELDBUS ${_QUIET} ${MY_PKG}) + +find_library(ELDBUS_LIBRARY + NAMES ${PC_LIBELDBUS_LIBRARIES} + HINTS ${PC_LIBELDBUS_LIBDIR} ${PC_LIBELDBUS_LIBRARY_DIRS} ) + +set(ELDBUS_DEFINITIONS ${PC_LIBELDBUS_CFLAGS_OTHER}) +set(ELDBUS_LIBRARIES ${ELDBUS_LIBRARY}) +set(ELDBUS_INCLUDE_DIRS ${PC_LIBELDBUS_INCLUDE_DIRS}) + +include(FindPackageHandleStandardArgs) +# handle the QUIETLY and REQUIRED arguments and set ELDBUS_FOUND to TRUE +# if all listed variables are TRUE +find_package_handle_standard_args(${MY_PKG} DEFAULT_MSG + ELDBUS_LIBRARIES ELDBUS_INCLUDE_DIRS) + +mark_as_advanced(ELDBUS_INCLUDE_DIRS ELDBUS_LIBRARY ELDBUS_LIBRARIES ELDBUS_DEFINITIONS) + diff --git a/cmakeconfig/EthumbClientConfig.cmake.in b/cmakeconfig/EthumbClientConfig.cmake.in new file mode 100644 index 0000000000..fb66932c0a --- /dev/null +++ b/cmakeconfig/EthumbClientConfig.cmake.in @@ -0,0 +1,32 @@ +# - Try to find ethumb_client +# Once done this will define +# ETHUMB_CLIENT_FOUND - System has ethumb_client +# ETHUMB_CLIENT_INCLUDE_DIRS - The ethumb_client include directories +# ETHUMB_CLIENT_LIBRARIES - The libraries needed to use ethumb_client +# ETHUMB_CLIENT_DEFINITIONS - Compiler switches required for using ethumb_client + +set(MY_PKG ethumb_client) + +find_package(PkgConfig) +if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1") + # "QUIET" was introduced in 2.8.2 + set(_QUIET QUIET) +endif () +pkg_check_modules(PC_LIBETHUMB_CLIENT ${_QUIET} ${MY_PKG}) + +find_library(ETHUMB_CLIENT_LIBRARY + NAMES ${PC_LIBETHUMB_CLIENT_LIBRARIES} + HINTS ${PC_LIBETHUMB_CLIENT_LIBDIR} ${PC_LIBETHUMB_CLIENT_LIBRARY_DIRS} ) + +set(ETHUMB_CLIENT_DEFINITIONS ${PC_LIBETHUMB_CLIENT_CFLAGS_OTHER}) +set(ETHUMB_CLIENT_LIBRARIES ${ETHUMB_CLIENT_LIBRARY}) +set(ETHUMB_CLIENT_INCLUDE_DIRS ${PC_LIBETHUMB_CLIENT_INCLUDE_DIRS}) + +include(FindPackageHandleStandardArgs) +# handle the QUIETLY and REQUIRED arguments and set ETHUMB_CLIENT_FOUND to TRUE +# if all listed variables are TRUE +find_package_handle_standard_args(${MY_PKG} DEFAULT_MSG + ETHUMB_CLIENT_LIBRARIES ETHUMB_CLIENT_INCLUDE_DIRS) + +mark_as_advanced(ETHUMB_CLIENT_INCLUDE_DIRS ETHUMB_CLIENT_LIBRARY ETHUMB_CLIENT_LIBRARIES ETHUMB_CLIENT_DEFINITIONS) + diff --git a/cmakeconfig/EthumbConfig.cmake.in b/cmakeconfig/EthumbConfig.cmake.in new file mode 100644 index 0000000000..65a79fcfd2 --- /dev/null +++ b/cmakeconfig/EthumbConfig.cmake.in @@ -0,0 +1,32 @@ +# - Try to find ethumb +# Once done this will define +# ETHUMB_FOUND - System has ethumb +# ETHUMB_INCLUDE_DIRS - The ethumb include directories +# ETHUMB_LIBRARIES - The libraries needed to use ethumb +# ETHUMB_DEFINITIONS - Compiler switches required for using ethumb + +set(MY_PKG ethumb) + +find_package(PkgConfig) +if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1") + # "QUIET" was introduced in 2.8.2 + set(_QUIET QUIET) +endif () +pkg_check_modules(PC_LIBETHUMB ${_QUIET} ${MY_PKG}) + +find_library(ETHUMB_LIBRARY + NAMES ${PC_LIBETHUMB_LIBRARIES} + HINTS ${PC_LIBETHUMB_LIBDIR} ${PC_LIBETHUMB_LIBRARY_DIRS} ) + +set(ETHUMB_DEFINITIONS ${PC_LIBETHUMB_CFLAGS_OTHER}) +set(ETHUMB_LIBRARIES ${ETHUMB_LIBRARY}) +set(ETHUMB_INCLUDE_DIRS ${PC_LIBETHUMB_INCLUDE_DIRS}) + +include(FindPackageHandleStandardArgs) +# handle the QUIETLY and REQUIRED arguments and set ETHUMB_FOUND to TRUE +# if all listed variables are TRUE +find_package_handle_standard_args(${MY_PKG} DEFAULT_MSG + ETHUMB_LIBRARIES ETHUMB_INCLUDE_DIRS) + +mark_as_advanced(ETHUMB_INCLUDE_DIRS ETHUMB_LIBRARY ETHUMB_LIBRARIES ETHUMB_DEFINITIONS) + diff --git a/configure.ac b/configure.ac index 89244e4b2a..4c3c8b5b75 100644 --- a/configure.ac +++ b/configure.ac @@ -3815,8 +3815,14 @@ cmakeconfig/EcoreConfig.cmake cmakeconfig/EcoreConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in cmakeconfig/EdjeConfig.cmake cmakeconfig/EdjeConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EldbusConfig.cmake +cmakeconfig/EldbusConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in cmakeconfig/EfreetConfig.cmake cmakeconfig/EfreetConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EthumbConfig.cmake +cmakeconfig/EthumbConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EthumbClientConfig.cmake +cmakeconfig/EthumbClientConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in ]) AC_OUTPUT