Merge branch '1.7.x'

This commit is contained in:
Alexey Sokolov
2019-11-23 10:16:49 +00:00
+6 -6
View File
@@ -90,8 +90,6 @@ foreach(modpath ${all_modules})
continue()
endif()
list(APPEND actual_modules "${modpath}")
set(modenabled true)
if(moddisable_${mod})
@@ -109,14 +107,16 @@ foreach(modpath ${all_modules})
if(modenabled)
if(modtype STREQUAL "cpp")
add_cxx_module("${mod}" "${modpath}")
endif()
if(modtype STREQUAL "pm")
elseif(modtype STREQUAL "pm")
add_perl_module("${mod}" "${modpath}")
endif()
if(modtype STREQUAL "py")
elseif(modtype STREQUAL "py")
add_python_module("${mod}" "${modpath}")
else()
continue()
endif()
endif()
list(APPEND actual_modules "${modpath}")
endforeach()
if(HAVE_I18N)