Index: unix/cmake/Plugins.cmake =================================================================== --- unix/cmake/Plugins.cmake (révision 2156) +++ unix/cmake/Plugins.cmake (copie de travail) @@ -3,13 +3,29 @@ # Last edited: 2009-09-17 09:34:24 by piumarta on ubuntu.piumarta.com FILE (STRINGS ${src}/plugins.int plugins_int) -STRING (REGEX REPLACE ".*= (.*)" "\\1" plugins_int ${plugins_int}) -STRING (REPLACE " " ";" plugins_int ${plugins_int}) +STRING (REGEX REPLACE ".*=(.*)" "\\1" plugins_int ${plugins_int}) +SET (plugins_int_str None) +SET (plugins_ext_str None) + +IF (plugins_int) + STRING (STRIP plugin_int ${plugins_int}) + SET (plugins_int_str ${plugins_int}) + STRING (REPLACE " " ";" plugins_int ${plugins_int}) +ENDIF () + FILE (STRINGS ${src}/plugins.ext plugins_ext) -STRING (REGEX REPLACE ".*= (.*)" "\\1" plugins_ext ${plugins_ext}) -STRING (REPLACE " " ";" plugins_ext ${plugins_ext}) +STRING (REGEX REPLACE ".*=(.*)" "\\1" plugins_ext ${plugins_ext}) +IF (plugins_ext) + STRING (STRIP plugin_ext ${plugins_ext}) + SET (plugins_ext_str ${plugins_ext}) + STRING (REPLACE " " ";" plugins_ext ${plugins_ext}) +ENDIF () + +MESSAGE(STATUS internal plugins: "${plugins_int_str}") +MESSAGE(STATUS external plugins: "${plugins_ext_str}") + FILE (GLOB plugins_vm RELATIVE ${unix} ${unix}/vm-*) FILE_COPY (${bld}/disabledPlugins.c ${config}/disabledPlugins.c) Index: unix/plugins/FT2Plugin/config.cmake =================================================================== --- unix/plugins/FT2Plugin/config.cmake (révision 0) +++ unix/plugins/FT2Plugin/config.cmake (révision 0) @@ -0,0 +1 @@ +PLUGIN_REQUIRE_PACKAGE(FT2 freetype2)