summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@profusion.mobi>2017-01-23 19:04:30 -0200
committerGustavo Sverzut Barbieri <barbieri@profusion.mobi>2017-01-23 19:04:30 -0200
commitce97fc1dd3fbb72ff4e02772debf23b6eb8d3e68 (patch)
treec26822daa7e16e5dc7a693013ef9ffb48df1e611
parent62ec4c8aa2dd9765ff96d3631d1b24f7cd06e170 (diff)
cmake: also process non-public eo files.
the only difference is they do not get installed, but may be used to generate internal .eo.c
-rw-r--r--cmake/helpers/EflMacros.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/helpers/EflMacros.cmake b/cmake/helpers/EflMacros.cmake
index 7aad512ac5..2ba901b2cc 100644
--- a/cmake/helpers/EflMacros.cmake
+++ b/cmake/helpers/EflMacros.cmake
@@ -554,6 +554,7 @@ endfunction()
554# - PUBLIC_LIBRARIES: results in target_link_libraries(LINK_PUBLIC) 554# - PUBLIC_LIBRARIES: results in target_link_libraries(LINK_PUBLIC)
555# - DEFINITIONS: target_compile_definitions() 555# - DEFINITIONS: target_compile_definitions()
556# - PUBLIC_EO_FILES: the eo files will be used to build that lib, and will be installed to the filesystem 556# - PUBLIC_EO_FILES: the eo files will be used to build that lib, and will be installed to the filesystem
557# - EO_FILES: the eo files will be used to build that lib but not installed.
557# 558#
558# Defines the following variables that can be used within the included files: 559# Defines the following variables that can be used within the included files:
559# - EFL_LIB_CURRENT to ${Name} 560# - EFL_LIB_CURRENT to ${Name}
@@ -622,6 +623,7 @@ function(EFL_LIB _target)
622 set(PUBLIC_LIBRARIES) 623 set(PUBLIC_LIBRARIES)
623 set(DEFINITIONS) 624 set(DEFINITIONS)
624 set(PUBLIC_EO_FILES) 625 set(PUBLIC_EO_FILES)
626 set(EO_FILES)
625 627
626 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config/${_target}.cmake OPTIONAL) 628 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config/${_target}.cmake OPTIONAL)
627 include(${EFL_LIB_SOURCE_DIR}/CMakeLists.txt OPTIONAL) 629 include(${EFL_LIB_SOURCE_DIR}/CMakeLists.txt OPTIONAL)
@@ -630,7 +632,7 @@ function(EFL_LIB _target)
630 endif() 632 endif()
631 633
632 #merge public eo files into sources 634 #merge public eo files into sources
633 set(SOURCES ${SOURCES} ${PUBLIC_EO_FILES}) 635 set(SOURCES ${SOURCES} ${PUBLIC_EO_FILES} ${EO_FILES})
634 636
635 EFL_FILES_TO_ABSOLUTE(_headers ${EFL_LIB_SOURCE_DIR} ${EFL_LIB_BINARY_DIR} 637 EFL_FILES_TO_ABSOLUTE(_headers ${EFL_LIB_SOURCE_DIR} ${EFL_LIB_BINARY_DIR}
636 ${PUBLIC_HEADERS}) 638 ${PUBLIC_HEADERS})
@@ -722,6 +724,7 @@ function(EFL_LIB _target)
722 unset(DEFINITIONS) 724 unset(DEFINITIONS)
723 unset(DESCRIPTION) 725 unset(DESCRIPTION)
724 unset(PUBLIC_EO_FILES) 726 unset(PUBLIC_EO_FILES)
727 unset(EO_FILES)
725 unset(PKG_CONFIG_REQUIRES) 728 unset(PKG_CONFIG_REQUIRES)
726 unset(PKG_CONFIG_REQUIRES_PRIVATE) 729 unset(PKG_CONFIG_REQUIRES_PRIVATE)
727 730