summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-09-22 16:08:21 +0100
committerTom Hacohen <tom@stosb.com>2014-09-22 16:08:37 +0100
commitc51dbe3a2cb2f8fb8745bb8eb05834ba7e90243f (patch)
tree0f2e0e8c60020e97d56b413f025a96b666864e01
parent8ebf5d49b26bc7a9310a6319d280a6dd42d6dc07 (diff)
Add missing cmake config for efl libs.
-rw-r--r--Makefile.am5
-rw-r--r--cmakeconfig/EflConfig.cmake.in32
-rw-r--r--configure.ac2
3 files changed, 39 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 979ac6c..6ddb5ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -257,6 +257,11 @@ pkgconfig_DATA += pc/ecore-audio.pc pc/ecore-audio-cxx.pc
257endif 257endif
258 258
259# Cmake configs: 259# Cmake configs:
260efl_cmakeconfigdir = $(libdir)/cmake/Efl/
261efl_cmakeconfig_DATA = \
262cmakeconfig/EflConfig.cmake \
263cmakeconfig/EflConfigVersion.cmake
264
260eina_cmakeconfigdir = $(libdir)/cmake/Eina/ 265eina_cmakeconfigdir = $(libdir)/cmake/Eina/
261eina_cmakeconfig_DATA = \ 266eina_cmakeconfig_DATA = \
262cmakeconfig/EinaConfig.cmake \ 267cmakeconfig/EinaConfig.cmake \
diff --git a/cmakeconfig/EflConfig.cmake.in b/cmakeconfig/EflConfig.cmake.in
new file mode 100644
index 0000000..8597474
--- /dev/null
+++ b/cmakeconfig/EflConfig.cmake.in
@@ -0,0 +1,32 @@
1# - Try to find efl
2# Once done this will define
3# EFL_FOUND - System has efl
4# EFL_INCLUDE_DIRS - The efl include directories
5# EFL_LIBRARIES - The libraries needed to use efl
6# EFL_DEFINITIONS - Compiler switches required for using efl
7
8set(MY_PKG efl)
9
10find_package(PkgConfig)
11if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1")
12 # "QUIET" was introduced in 2.8.2
13 set(_QUIET QUIET)
14endif ()
15pkg_check_modules(PC_LIBEFL ${_QUIET} ${MY_PKG})
16
17find_library(EFL_LIBRARY
18 NAMES ${PC_LIBEFL_LIBRARIES}
19 HINTS ${PC_LIBEFL_LIBDIR} ${PC_LIBEFL_LIBRARY_DIRS} )
20
21set(EFL_DEFINITIONS ${PC_LIBEFL_CFLAGS_OTHER})
22set(EFL_LIBRARIES ${EFL_LIBRARY})
23set(EFL_INCLUDE_DIRS ${PC_LIBEFL_INCLUDE_DIRS})
24
25include(FindPackageHandleStandardArgs)
26# handle the QUIETLY and REQUIRED arguments and set EFL_FOUND to TRUE
27# if all listed variables are TRUE
28find_package_handle_standard_args(${MY_PKG} DEFAULT_MSG
29 EFL_LIBRARIES EFL_INCLUDE_DIRS)
30
31mark_as_advanced(EFL_INCLUDE_DIRS EFL_LIBRARY EFL_LIBRARIES EFL_DEFINITIONS)
32
diff --git a/configure.ac b/configure.ac
index a0f60c9..6946c0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4480,6 +4480,8 @@ systemd-services/efreet.service
4480systemd-services/ethumb.service 4480systemd-services/ethumb.service
4481$po_makefile_in 4481$po_makefile_in
4482$po_makevars 4482$po_makevars
4483cmakeconfig/EflConfig.cmake
4484cmakeconfig/EflConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
4483cmakeconfig/EinaConfig.cmake 4485cmakeconfig/EinaConfig.cmake
4484cmakeconfig/EinaConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in 4486cmakeconfig/EinaConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
4485cmakeconfig/EezeConfig.cmake 4487cmakeconfig/EezeConfig.cmake