Commit 8159d643 authored by Alexey Sokolov's avatar Alexey Sokolov

Merge branch '1.7.x'

parents e6dcaf06 f6327b82
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment