jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e4ab76c39765891eca54a67a4d5b880498671c05
commit e4ab76c39765891eca54a67a4d5b880498671c05 Author: Daniel Zaoui <[email protected]> Date: Mon Apr 14 13:54:02 2014 +0300 Eolian: add support for cmake Now with the file :-) --- Makefile.am | 5 +++++ cmakeconfig/EolianConfig.cmake.in | 32 ++++++++++++++++++++++++++++++++ configure.ac | 2 ++ 3 files changed, 39 insertions(+) diff --git a/Makefile.am b/Makefile.am index cfdb304..83b8172 100644 --- a/Makefile.am +++ b/Makefile.am @@ -258,6 +258,11 @@ eo_cmakeconfig_DATA = \ cmakeconfig/EoConfig.cmake \ cmakeconfig/EoConfigVersion.cmake +eolian_cmakeconfigdir = $(libdir)/cmake/Eolian/ +eolian_cmakeconfig_DATA = \ +cmakeconfig/EolianConfig.cmake \ +cmakeconfig/EolianConfigVersion.cmake + eet_cmakeconfigdir = $(libdir)/cmake/Eet/ eet_cmakeconfig_DATA = \ cmakeconfig/EetConfig.cmake \ diff --git a/cmakeconfig/EolianConfig.cmake.in b/cmakeconfig/EolianConfig.cmake.in new file mode 100644 index 0000000..8ab886b --- /dev/null +++ b/cmakeconfig/EolianConfig.cmake.in @@ -0,0 +1,32 @@ +# - Try to find eolian +# Once done this will define +# EOLIAN_FOUND - System has eolian +# EOLIAN_INCLUDE_DIRS - The eolian include directories +# EOLIAN_LIBRARIES - The libraries needed to use eolian +# EOLIAN_DEFINITIONS - Compiler switches required for using eolian + +set(MY_PKG eolian) + +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_LIBEOLIAN ${_QUIET} ${MY_PKG}) + +find_library(EOLIAN_LIBRARY + NAMES ${PC_LIBEOLIAN_LIBRARIES} + HINTS ${PC_LIBEOLIAN_LIBDIR} ${PC_LIBEOLIAN_LIBRARY_DIRS} ) + +set(EOLIAN_DEFINITIONS ${PC_LIBEOLIAN_CFLAGS_OTHER}) +set(EOLIAN_LIBRARIES ${EOLIAN_LIBRARY}) +set(EOLIAN_INCLUDE_DIRS ${PC_LIBEOLIAN_INCLUDE_DIRS}) + +include(FindPackageHandleStandardArgs) +# handle the QUIETLY and REQUIRED arguments and set EOLIAN_FOUND to TRUE +# if all listed variables are TRUE +find_package_handle_standard_args(${MY_PKG} DEFAULT_MSG + EOLIAN_LIBRARIES EOLIAN_INCLUDE_DIRS) + +mark_as_advanced(EOLIAN_INCLUDE_DIRS EOLIAN_LIBRARY EOLIAN_LIBRARIES EOLIAN_DEFINITIONS) + diff --git a/configure.ac b/configure.ac index 8150949..61a60e9 100644 --- a/configure.ac +++ b/configure.ac @@ -4168,6 +4168,8 @@ cmakeconfig/EezeConfig.cmake cmakeconfig/EezeConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in cmakeconfig/EoConfig.cmake cmakeconfig/EoConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EolianConfig.cmake +cmakeconfig/EolianConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in cmakeconfig/EetConfig.cmake cmakeconfig/EetConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in cmakeconfig/EvasConfig.cmake --
