enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

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.
This commit is contained in:
Gustavo Sverzut Barbieri 2017-01-26 14:48:20 -02:00
parent e1937739a2
commit ebab91182c
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/config/eolian.cmake
View File

@ -1 +1 @@
EFL_OPTION(EOLIAN_BIN "The eolian_gen binary to use" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/eolian_gen)
EFL_OPTION(EOLIAN_BIN "The eolian_gen binary to use" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/eolian_gen FILEPATH)

6
cmake/helpers/EflMacros.cmake
View File

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