enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

cmake: minor simplification of eo files, do not leak vars. 

unset the eo variables before we go process modules, tests and
binaries.
This commit is contained in:
Gustavo Sverzut Barbieri 2017-01-23 18:40:39 -02:00
parent 55750d41fa
commit c178d681f0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/helpers/EflMacros.cmake
View File

@ -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)