summaryrefslogtreecommitdiff
path: root/cmake/helpers/EflMacros.cmake
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@profusion.mobi>2017-01-23 18:40:39 -0200
committerGustavo Sverzut Barbieri <barbieri@profusion.mobi>2017-01-23 18:59:36 -0200
commitc178d681f0d93341306f61a71f5ce185a0903e5b (patch)
tree330cb6cc247f267258f6213cddf6db19f3e5689a /cmake/helpers/EflMacros.cmake
parent55750d41fad6055a549664ae92a34e636d7fb1f0 (diff)
cmake: minor simplification of eo files, do not leak vars.
unset the eo variables before we go process modules, tests and binaries.
Diffstat (limited to 'cmake/helpers/EflMacros.cmake')
-rw-r--r--cmake/helpers/EflMacros.cmake9
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)
621 set(LIBRARIES) 621 set(LIBRARIES)
622 set(PUBLIC_LIBRARIES) 622 set(PUBLIC_LIBRARIES)
623 set(DEFINITIONS) 623 set(DEFINITIONS)
624 set(PUBLIC_EO_FILES)
624 625
625 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config/${_target}.cmake OPTIONAL) 626 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config/${_target}.cmake OPTIONAL)
626 include(${EFL_LIB_SOURCE_DIR}/CMakeLists.txt OPTIONAL) 627 include(${EFL_LIB_SOURCE_DIR}/CMakeLists.txt OPTIONAL)
@@ -640,10 +641,10 @@ function(EFL_LIB _target)
640 EFL_FILES_TO_ABSOLUTE(_public_eo_files ${EFL_LIB_SOURCE_DIR} ${EFL_LIB_BINARY_DIR} 641 EFL_FILES_TO_ABSOLUTE(_public_eo_files ${EFL_LIB_SOURCE_DIR} ${EFL_LIB_BINARY_DIR}
641 ${PUBLIC_EO_FILES}) 642 ${PUBLIC_EO_FILES})
642 643
643 foreach(public_eo_file ${_public_eo_files}) 644 foreach(public_eo_file ${PUBLIC_EO_FILES})
644 get_filename_component(filename ${public_eo_file} NAME) 645 list(APPEND _headers ${EFL_LIB_BINARY_DIR}/${public_eo_file}.h)
645 list(APPEND _headers ${EFL_LIB_BINARY_DIR}/${filename}.h)
646 endforeach() 646 endforeach()
647 unset(public_eo_file)
647 648
648 EFL_PKG_CONFIG_EVAL(${_target} "${PKG_CONFIG_REQUIRES_PRIVATE}" "${PKG_CONFIG_REQUIRES}") 649 EFL_PKG_CONFIG_EVAL(${_target} "${PKG_CONFIG_REQUIRES_PRIVATE}" "${PKG_CONFIG_REQUIRES}")
649 650
@@ -705,6 +706,7 @@ function(EFL_LIB _target)
705 unset(_sources) 706 unset(_sources)
706 unset(_headers) 707 unset(_headers)
707 unset(_obj_deps) 708 unset(_obj_deps)
709 unset(_public_eo_files)
708 unset(INCLUDE_DIRECTORIES) 710 unset(INCLUDE_DIRECTORIES)
709 unset(SYSTEM_INCLUDE_DIRECTORIES) 711 unset(SYSTEM_INCLUDE_DIRECTORIES)
710 unset(OUTPUT_NAME) 712 unset(OUTPUT_NAME)
@@ -719,6 +721,7 @@ function(EFL_LIB _target)
719 unset(PUBLIC_LIBRARIES) 721 unset(PUBLIC_LIBRARIES)
720 unset(DEFINITIONS) 722 unset(DEFINITIONS)
721 unset(DESCRIPTION) 723 unset(DESCRIPTION)
724 unset(PUBLIC_EO_FILES)
722 unset(PKG_CONFIG_REQUIRES) 725 unset(PKG_CONFIG_REQUIRES)
723 unset(PKG_CONFIG_REQUIRES_PRIVATE) 726 unset(PKG_CONFIG_REQUIRES_PRIVATE)
724 727