summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@profusion.mobi>2017-01-25 19:22:11 -0200
committerGustavo Sverzut Barbieri <barbieri@profusion.mobi>2017-01-25 19:29:20 -0200
commitc1b2701770bcccfc9ec95e07cb0561a0ff581620 (patch)
tree18ccd4c562eb913578bec2f1b939fb5557c9392d
parentf74ca08be9b78e5ac9a2f302ba2607db94872085 (diff)
cmake: check for variable defined, not if it evaluates to false.
otherwise we can't have modules off by default.
-rw-r--r--cmake/helpers/EflMacros.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/helpers/EflMacros.cmake b/cmake/helpers/EflMacros.cmake
index e00e4d8df3..95decbe976 100644
--- a/cmake/helpers/EflMacros.cmake
+++ b/cmake/helpers/EflMacros.cmake
@@ -1172,7 +1172,7 @@ function(EFL_MODULE _modname)
1172 set(_modbindir ${EFL_MODULES_BINARY_DIR}/${EFL_MODULE_SCOPE}/${_modname}) 1172 set(_modbindir ${EFL_MODULES_BINARY_DIR}/${EFL_MODULE_SCOPE}/${_modname})
1173 set(_modtarget ${EFL_LIB_CURRENT}-module-${EFL_MODULE_SCOPE}-${_modname}) 1173 set(_modtarget ${EFL_LIB_CURRENT}-module-${EFL_MODULE_SCOPE}-${_modname})
1174 string(TOUPPER "${EFL_LIB_CURRENT}_MODULE_TYPE_${EFL_MODULE_SCOPE}_${_modname}" _modoptionname) 1174 string(TOUPPER "${EFL_LIB_CURRENT}_MODULE_TYPE_${EFL_MODULE_SCOPE}_${_modname}" _modoptionname)
1175 if(NOT ${_modoptionname}_DEFAULT) 1175 if(NOT DEFINED ${_modoptionname}_DEFAULT)
1176 set(${_modoptionname}_DEFAULT "ON") 1176 set(${_modoptionname}_DEFAULT "ON")
1177 endif() 1177 endif()
1178 EFL_OPTION(${_modoptionname} "Build ${EFL_LIB_CURRENT} module ${EFL_MODULE_SCOPE}/${_modname}" ${${_modoptionname}_DEFAULT} CHOICE ON;OFF;STATIC) 1178 EFL_OPTION(${_modoptionname} "Build ${EFL_LIB_CURRENT} module ${EFL_MODULE_SCOPE}/${_modname}" ${${_modoptionname}_DEFAULT} CHOICE ON;OFF;STATIC)
@@ -1182,7 +1182,7 @@ function(EFL_MODULE _modname)
1182 set(_modbindir ${EFL_MODULES_BINARY_DIR}/${_modname}) 1182 set(_modbindir ${EFL_MODULES_BINARY_DIR}/${_modname})
1183 set(_modtarget ${EFL_LIB_CURRENT}-module-${_modname}) 1183 set(_modtarget ${EFL_LIB_CURRENT}-module-${_modname})
1184 string(TOUPPER "${EFL_LIB_CURRENT}_MODULE_TYPE_${_modname}" _modoptionname) 1184 string(TOUPPER "${EFL_LIB_CURRENT}_MODULE_TYPE_${_modname}" _modoptionname)
1185 if(NOT ${_modoptionname}_DEFAULT) 1185 if(NOT DEFINED ${_modoptionname}_DEFAULT)
1186 set(${_modoptionname}_DEFAULT "ON") 1186 set(${_modoptionname}_DEFAULT "ON")
1187 endif() 1187 endif()
1188 EFL_OPTION(${_modoptionname} "Build ${EFL_LIB_CURRENT} module ${_modname}" ${${_modoptionname}_DEFAULT} CHOICE ON;OFF;STATIC) 1188 EFL_OPTION(${_modoptionname} "Build ${EFL_LIB_CURRENT} module ${_modname}" ${${_modoptionname}_DEFAULT} CHOICE ON;OFF;STATIC)