cmake: add EFL_SUPPORT_LIB() and simplify/speedup its usage.

generate a static library for src/static_libs and use that as
LIBRARIES for the actual library, for those such as rg_etc that are
used multiple times will even speed up the final build by compiling
only once.

Although not used, they can be made into shared libraries that would
go inside /usr/lib/efl/support/v-1.19/libname.so

3 files changed, 7 insertions, 48 deletions

diff --git a/src/lib/ector/CMakeLists.txt b/src/lib/ector/CMakeLists.txt
index 133909192b..71daae7705 100644
--- a/src/lib/ector/CMakeLists.txt
+++ b/src/lib/ector/CMakeLists.txt
@@ -5,6 +5,10 @@ set(LIBRARIES
   efl
   emile
   m
+  support-draw
+  support-freetype
+  support-rg_etc
+  support-triangulator
 )
 
 set(PUBLIC_LIBRARIES
@@ -99,31 +103,6 @@ set(SOURCES
   software/ector_software_gradient.c
   software/ector_software_rasterizer.c
   software/ector_software_surface.c
-
-  ${CMAKE_SOURCE_DIR}/src/static_libs/draw/draw_main.c
-  ${CMAKE_SOURCE_DIR}/src/static_libs/draw/draw_main_neon.c
-  ${CMAKE_SOURCE_DIR}/src/static_libs/draw/draw_main_sse2.c
-
-  ${CMAKE_SOURCE_DIR}/src/static_libs/freetype/sw_ft_math.c
-  ${CMAKE_SOURCE_DIR}/src/static_libs/freetype/sw_ft_raster.c
-  ${CMAKE_SOURCE_DIR}/src/static_libs/freetype/sw_ft_stroker.c
-
-  ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/etc2_encoder.c
-  ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc1.c
-  ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc1.h
-  ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc2.c
-
-  ${CMAKE_SOURCE_DIR}/src/static_libs/triangulator/triangulator_simple.c
-  ${CMAKE_SOURCE_DIR}/src/static_libs/triangulator/triangulator_simple.h
-  ${CMAKE_SOURCE_DIR}/src/static_libs/triangulator/triangulator_stroker.c
-  ${CMAKE_SOURCE_DIR}/src/static_libs/triangulator/triangulator_stroker.h
-)
-
-set(INCLUDE_DIRECTORIES
-  ${CMAKE_SOURCE_DIR}/src/static_libs/draw
-  ${CMAKE_SOURCE_DIR}/src/static_libs/freetype
-  ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc
-  ${CMAKE_SOURCE_DIR}/src/static_libs/triangulator
 )
 
 add_custom_command(
diff --git a/src/lib/eet/CMakeLists.txt b/src/lib/eet/CMakeLists.txt
index b0aaffd190..813f29340e 100644
--- a/src/lib/eet/CMakeLists.txt
+++ b/src/lib/eet/CMakeLists.txt
@@ -12,6 +12,7 @@ set(PUBLIC_LIBRARIES
 
 set(LIBRARIES
   m
+  support-rg_etc
 )
 
 set(PUBLIC_HEADERS
@@ -29,14 +30,6 @@ set(SOURCES
   eet_node.c
   Eet_private.h
   eet_utils.c
-  ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc1.c
-  ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc2.c
-  ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/etc2_encoder.c
-  ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc1.h
-)
-
-set(INCLUDE_DIRECTORIES
-  ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc
 )
 
 if(WITH_CRYPTO STREQUAL "gnutls")
diff --git a/src/lib/emile/CMakeLists.txt b/src/lib/emile/CMakeLists.txt
index 559f7355b6..d6c315521a 100644
--- a/src/lib/emile/CMakeLists.txt
+++ b/src/lib/emile/CMakeLists.txt
@@ -8,6 +8,7 @@ set(PKG_CONFIG_REQUIRES_PRIVATE
 set(LIBRARIES
   eina
   m
+  support-rg_etc
 )
 
 set(PUBLIC_HEADERS
@@ -24,14 +25,6 @@ set(SOURCES
   emile_image.c
   emile_main.c
   emile_private.h
-  ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/etc2_encoder.c
-  ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc1.c
-  ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc1.h
-  ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc/rg_etc2.c
-)
-
-set(INCLUDE_DIRECTORIES
-  ${CMAKE_SOURCE_DIR}/src/static_libs/rg_etc
 )
 
 if(WITH_CRYPTO STREQUAL "gnutls")
@@ -47,11 +40,5 @@ endif()
 if(WITH_LZ4 STREQUAL "system")
   list(APPEND PKG_CONFIG_REQUIRES_PRIVATE liblz4)
 else()
-  list(APPEND SOURCES
-    ${CMAKE_SOURCE_DIR}/src/static_libs/lz4/lz4.c
-    ${CMAKE_SOURCE_DIR}/src/static_libs/lz4/lz4.h
-    ${CMAKE_SOURCE_DIR}/src/static_libs/lz4/lz4hc.c
-    ${CMAKE_SOURCE_DIR}/src/static_libs/lz4/lz4hc.h
-  )
-  list(APPEND INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/src/static_libs/lz4)
+  list(APPEND LIBRARIES support-lz4)
 endif()