diff --git a/CMakeLists.txt b/CMakeLists.txt index 194ff3c1c2..09479baea9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ include(${CMAKE_SOURCE_DIR}/cmake/config/common.cmake) EFL_LIB(eina) EFL_LIB(eolian) +EFL_LIB(eo) EFL_OPTIONS_SUMMARY() diff --git a/cmake/config/eo.cmake b/cmake/config/eo.cmake new file mode 100644 index 0000000000..8264d315f2 --- /dev/null +++ b/cmake/config/eo.cmake @@ -0,0 +1 @@ +EFL_OPTION(HAVE_EO_ID "Have Eo id indirection" ON) diff --git a/src/lib/efl/config.h.cmake b/src/lib/efl/config.h.cmake index f664e52665..47ceb53a8c 100644 --- a/src/lib/efl/config.h.cmake +++ b/src/lib/efl/config.h.cmake @@ -32,4 +32,6 @@ #cmakedefine EFL_HAVE_POSIX_THREADS_SPINLOCK 1 #cmakedefine EFL_HAVE_THREADS 1 +#cmakedefine HAVE_EO_ID + #endif diff --git a/src/lib/eo/CMakeLists.txt b/src/lib/eo/CMakeLists.txt new file mode 100644 index 0000000000..fb075f38af --- /dev/null +++ b/src/lib/eo/CMakeLists.txt @@ -0,0 +1,27 @@ +set(PUBLIC_LIBRARIES + eina +) + +set(PUBLIC_HEADERS + Eo.h + efl_future.h +) + +set(PUBLIC_EO_FILES + efl_object.eo + efl_class.eo + efl_object_override.eo + efl_interface.eo +) + +set(SOURCES + eo.c + eo_ptr_indirection.c + eo_ptr_indirection.h + eo_base_class.c + eo_class_class.c + eo_add_fallback.c + eo_add_fallback.h + eo_private.h + efl_future.c +) diff --git a/src/tests/eo/access/CMakeLists.txt b/src/tests/eo/access/CMakeLists.txt new file mode 100644 index 0000000000..19360f0333 --- /dev/null +++ b/src/tests/eo/access/CMakeLists.txt @@ -0,0 +1,13 @@ +set(LIBRARIES + eina + eo +) + +set(SOURCES + access_inherit.c + access_inherit.h + access_main.c + access_simple.c + access_simple.h + access_simple_protected.h +) diff --git a/src/tests/eo/children/CMakeLists.txt b/src/tests/eo/children/CMakeLists.txt new file mode 100644 index 0000000000..bcd86ef21c --- /dev/null +++ b/src/tests/eo/children/CMakeLists.txt @@ -0,0 +1,9 @@ +set(LIBRARIES + eo +) + +set(SOURCES + children_main.c + children_simple.c + children_simple.h +) diff --git a/src/tests/eo/composite_objects/CMakeLists.txt b/src/tests/eo/composite_objects/CMakeLists.txt new file mode 100644 index 0000000000..cab44f9ed6 --- /dev/null +++ b/src/tests/eo/composite_objects/CMakeLists.txt @@ -0,0 +1,11 @@ +set(LIBRARIES + eo +) + +set(SOURCES + composite_objects_comp.c + composite_objects_comp.h + composite_objects_main.c + composite_objects_simple.c + composite_objects_simple.h +) diff --git a/src/tests/eo/constructors/CMakeLists.txt b/src/tests/eo/constructors/CMakeLists.txt new file mode 100644 index 0000000000..60de7467b6 --- /dev/null +++ b/src/tests/eo/constructors/CMakeLists.txt @@ -0,0 +1,23 @@ +set(LIBRARIES + eo +) + +set(SOURCES + constructors_main.c + constructors_mixin.c + constructors_mixin.h + constructors_simple.c + constructors_simple.h + constructors_simple2.c + constructors_simple2.h + constructors_simple3.c + constructors_simple3.h + constructors_simple4.c + constructors_simple4.h + constructors_simple5.c + constructors_simple5.h + constructors_simple6.c + constructors_simple6.h + constructors_simple7.c + constructors_simple7.h +) diff --git a/src/tests/eo/function_overrides/CMakeLists.txt b/src/tests/eo/function_overrides/CMakeLists.txt new file mode 100644 index 0000000000..c961d3be64 --- /dev/null +++ b/src/tests/eo/function_overrides/CMakeLists.txt @@ -0,0 +1,15 @@ +set(LIBRARIES + eo +) + +set(SOURCES + function_overrides_inherit.c + function_overrides_inherit.h + function_overrides_inherit2.c + function_overrides_inherit2.h + function_overrides_inherit3.c + function_overrides_inherit3.h + function_overrides_main.c + function_overrides_simple.c + function_overrides_simple.h +) diff --git a/src/tests/eo/interface/CMakeLists.txt b/src/tests/eo/interface/CMakeLists.txt new file mode 100644 index 0000000000..8bc1a992fe --- /dev/null +++ b/src/tests/eo/interface/CMakeLists.txt @@ -0,0 +1,14 @@ +set(LIBRARIES + eo +) + +set(SOURCES +interface_interface.c +interface_interface.h +interface_interface2.c +interface_interface2.h +interface_main.c +interface_simple.c +interface_simple.h + +) diff --git a/src/tests/eo/mixin/CMakeLists.txt b/src/tests/eo/mixin/CMakeLists.txt new file mode 100644 index 0000000000..a7f92d6883 --- /dev/null +++ b/src/tests/eo/mixin/CMakeLists.txt @@ -0,0 +1,19 @@ +set(LIBRARIES + eo +) + +set(SOURCES + mixin_inherit.c + mixin_inherit.h + mixin_main.c + mixin_mixin.c + mixin_mixin.h + mixin_mixin2.c + mixin_mixin2.h + mixin_mixin3.c + mixin_mixin3.h + mixin_mixin4.c + mixin_mixin4.h + mixin_simple.c + mixin_simple.h +) diff --git a/src/tests/eo/signals/CMakeLists.txt b/src/tests/eo/signals/CMakeLists.txt new file mode 100644 index 0000000000..f6d3fae51b --- /dev/null +++ b/src/tests/eo/signals/CMakeLists.txt @@ -0,0 +1,9 @@ +set(LIBRARIES + eo +) + +set(SOURCES + signals_main.c + signals_simple.c + signals_simple.h +) diff --git a/src/tests/eo/suite/CMakeLists.txt b/src/tests/eo/suite/CMakeLists.txt new file mode 100644 index 0000000000..14cad83941 --- /dev/null +++ b/src/tests/eo/suite/CMakeLists.txt @@ -0,0 +1,24 @@ +set(LIBRARIES + eo +) + +set(SOURCES + eo_error_msgs.c + eo_error_msgs.h + eo_suite.c + eo_suite.h + eo_test_call_errors.c + eo_test_class_behaviour_errors.c + eo_test_class_errors.c + eo_test_class_simple.c + eo_test_class_simple.h + eo_test_class_singleton.c + eo_test_class_singleton.h + eo_test_domain.c + eo_test_domain.h + eo_test_event.c + eo_test_general.c + eo_test_init.c + eo_test_threaded_calls.c + eo_test_value.c +)