barbieri pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ebab91182cec0c17e41b74c747b828b8e41ebbab
commit ebab91182cec0c17e41b74c747b828b8e41ebbab Author: Gustavo Sverzut Barbieri <[email protected]> Date: Thu Jan 26 14:48:20 2017 -0200 cmake/eolian: fix EOLIAN_BIN type. So EOLIAN_BIN had no type, which resulted in BOOL and thus ON/OFF. It should be labeled as FILEPATH and then we can remove the special case in EflMacros.cmake. --- cmake/config/eolian.cmake | 2 +- cmake/helpers/EflMacros.cmake | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cmake/config/eolian.cmake b/cmake/config/eolian.cmake index 5c9a6ca..ec69256 100644 --- a/cmake/config/eolian.cmake +++ b/cmake/config/eolian.cmake @@ -1 +1 @@ -EFL_OPTION(EOLIAN_BIN "The eolian_gen binary to use" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/eolian_gen) \ No newline at end of file +EFL_OPTION(EOLIAN_BIN "The eolian_gen binary to use" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/eolian_gen FILEPATH) diff --git a/cmake/helpers/EflMacros.cmake b/cmake/helpers/EflMacros.cmake index 2f52830..41ad0dc 100644 --- a/cmake/helpers/EflMacros.cmake +++ b/cmake/helpers/EflMacros.cmake @@ -1428,10 +1428,6 @@ function(EFL_CREATE_EO_RULES target source_dir generation_dir) #add the custom rule if(file_eo_gen_files) - if(EOLIAN_BIN STREQUAL ON) - set(EOLIAN_BIN ${CMAKE_BINARY_DIR}/bin/eolian_gen) - set(IN_TREE_EOLIAN ON) - endif() add_custom_command( OUTPUT ${file_eo_gen_files} COMMAND ${EOLIAN_BIN} ${rel_include_cmd} ${include_cmd} ${EOLIAN_EXTRA_PARAMS} ${out_cmd} ${file} @@ -1458,7 +1454,7 @@ function(EFL_CREATE_EO_RULES target source_dir generation_dir) DEPENDS ${all_eo_gen_files} ) add_dependencies(${target} ${target}-eo) - if(IN_TREE_EOLIAN) + if(${EOLIAN_BIN} STREQUAL ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/eolian_gen) add_dependencies(${target}-eo eolian-bin) endif() endif() --
