diff options
| author | Gustavo Sverzut Barbieri <barbieri@profusion.mobi> | 2017-01-23 18:40:39 -0200 |
|---|---|---|
| committer | Gustavo Sverzut Barbieri <barbieri@profusion.mobi> | 2017-01-23 18:59:36 -0200 |
| commit | c178d681f0d93341306f61a71f5ce185a0903e5b (patch) | |
| tree | 330cb6cc247f267258f6213cddf6db19f3e5689a | |
| parent | 55750d41fad6055a549664ae92a34e636d7fb1f0 (diff) | |
| download | efl-c178d681f0d93341306f61a71f5ce185a0903e5b.tar.gz | |
cmake: minor simplification of eo files, do not leak vars.
unset the eo variables before we go process modules, tests and
binaries.
| -rw-r--r-- | cmake/helpers/EflMacros.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cmake/helpers/EflMacros.cmake b/cmake/helpers/EflMacros.cmake index 71f8cfc1ab..111fde794c 100644 --- a/cmake/helpers/EflMacros.cmake +++ b/cmake/helpers/EflMacros.cmake @@ -621,6 +621,7 @@ function(EFL_LIB _target) set(LIBRARIES) set(PUBLIC_LIBRARIES) set(DEFINITIONS) + set(PUBLIC_EO_FILES) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config/${_target}.cmake OPTIONAL) include(${EFL_LIB_SOURCE_DIR}/CMakeLists.txt OPTIONAL) @@ -640,10 +641,10 @@ function(EFL_LIB _target) EFL_FILES_TO_ABSOLUTE(_public_eo_files ${EFL_LIB_SOURCE_DIR} ${EFL_LIB_BINARY_DIR} ${PUBLIC_EO_FILES}) - foreach(public_eo_file ${_public_eo_files}) - get_filename_component(filename ${public_eo_file} NAME) - list(APPEND _headers ${EFL_LIB_BINARY_DIR}/${filename}.h) + foreach(public_eo_file ${PUBLIC_EO_FILES}) + list(APPEND _headers ${EFL_LIB_BINARY_DIR}/${public_eo_file}.h) endforeach() + unset(public_eo_file) EFL_PKG_CONFIG_EVAL(${_target} "${PKG_CONFIG_REQUIRES_PRIVATE}" "${PKG_CONFIG_REQUIRES}") @@ -705,6 +706,7 @@ function(EFL_LIB _target) unset(_sources) unset(_headers) unset(_obj_deps) + unset(_public_eo_files) unset(INCLUDE_DIRECTORIES) unset(SYSTEM_INCLUDE_DIRECTORIES) unset(OUTPUT_NAME) @@ -719,6 +721,7 @@ function(EFL_LIB _target) unset(PUBLIC_LIBRARIES) unset(DEFINITIONS) unset(DESCRIPTION) + unset(PUBLIC_EO_FILES) unset(PKG_CONFIG_REQUIRES) unset(PKG_CONFIG_REQUIRES_PRIVATE) |