diff --git a/legacy/eobj/cmake/Modules/FindEina.cmake b/legacy/eobj/cmake/Modules/FindEina.cmake index acbd799f3e..efc47e6607 100644 --- a/legacy/eobj/cmake/Modules/FindEina.cmake +++ b/legacy/eobj/cmake/Modules/FindEina.cmake @@ -3,11 +3,13 @@ # EINA_FOUND - System has eina # EINA_INCLUDE_DIRS - The eina include directories # EINA_LIBRARIES - The libraries needed to use eina +# EINA_LDFLAGS_OTHER - Other LDFLAGS needed te use eina. # EINA_DEFINITIONS - Compiler switches required for using eina find_package(PkgConfig) pkg_check_modules(PC_LIBEINA QUIET eina) set(EINA_DEFINITIONS ${PC_LIBEINA_CFLAGS_OTHER}) +set(EINA_LDFLAGS_OTHER ${PC_LIBEINA_LDFLAGS_OTHER}) find_path(EINA_INCLUDE_DIR Eina.h HINTS ${PC_LIBEINA_INCLUDEDIR} ${PC_LIBEINA_INCLUDE_DIRS} diff --git a/legacy/eobj/examples/access/CMakeLists.txt b/legacy/eobj/examples/access/CMakeLists.txt index c704a2fd7a..dcfbc1e576 100644 --- a/legacy/eobj/examples/access/CMakeLists.txt +++ b/legacy/eobj/examples/access/CMakeLists.txt @@ -15,6 +15,7 @@ add_executable(access ${ACCESS_CC_SOURCES}) get_target_property(eobj_LIB_FILE eobj LOCATION) target_link_libraries(access ${EINA_LIBRARIES} + ${EINA_LDFLAGS_OTHER} ${eobj_LIB_FILE} ) diff --git a/legacy/eobj/examples/composite_objects/CMakeLists.txt b/legacy/eobj/examples/composite_objects/CMakeLists.txt index 697fbbc608..cb79964222 100644 --- a/legacy/eobj/examples/composite_objects/CMakeLists.txt +++ b/legacy/eobj/examples/composite_objects/CMakeLists.txt @@ -15,6 +15,7 @@ add_executable(composite_objects ${COMPOSITE_OBJECTS_CC_SOURCES}) get_target_property(eobj_LIB_FILE eobj LOCATION) target_link_libraries(composite_objects ${EINA_LIBRARIES} + ${EINA_LDFLAGS_OTHER} ${eobj_LIB_FILE} ) diff --git a/legacy/eobj/examples/constructors/CMakeLists.txt b/legacy/eobj/examples/constructors/CMakeLists.txt index aa930bd41e..6daf946e2f 100644 --- a/legacy/eobj/examples/constructors/CMakeLists.txt +++ b/legacy/eobj/examples/constructors/CMakeLists.txt @@ -20,6 +20,7 @@ add_executable(constructors ${CONSTRUCTORS_CC_SOURCES}) get_target_property(eobj_LIB_FILE eobj LOCATION) target_link_libraries(constructors ${EINA_LIBRARIES} + ${EINA_LDFLAGS_OTHER} ${eobj_LIB_FILE} ) diff --git a/legacy/eobj/examples/evas/CMakeLists.txt b/legacy/eobj/examples/evas/CMakeLists.txt index ca19049c17..445e056248 100644 --- a/legacy/eobj/examples/evas/CMakeLists.txt +++ b/legacy/eobj/examples/evas/CMakeLists.txt @@ -18,6 +18,7 @@ add_executable(evas ${EVAS_CC_SOURCES}) get_target_property(eobj_LIB_FILE eobj LOCATION) target_link_libraries(evas ${EINA_LIBRARIES} + ${EINA_LDFLAGS_OTHER} ${EVAS_LIBRARIES} ${ELEMENTARY_LIBRARIES} ${eobj_LIB_FILE} diff --git a/legacy/eobj/examples/function_overrides/CMakeLists.txt b/legacy/eobj/examples/function_overrides/CMakeLists.txt index b17f19a5b5..a3344e4133 100644 --- a/legacy/eobj/examples/function_overrides/CMakeLists.txt +++ b/legacy/eobj/examples/function_overrides/CMakeLists.txt @@ -17,6 +17,7 @@ add_executable(function_overrides ${FUNCTION_OVERRIDES_CC_SOURCES}) get_target_property(eobj_LIB_FILE eobj LOCATION) target_link_libraries(function_overrides ${EINA_LIBRARIES} + ${EINA_LDFLAGS_OTHER} ${eobj_LIB_FILE} ) diff --git a/legacy/eobj/examples/mixin/CMakeLists.txt b/legacy/eobj/examples/mixin/CMakeLists.txt index 6560b9a223..0fd70d8c2d 100644 --- a/legacy/eobj/examples/mixin/CMakeLists.txt +++ b/legacy/eobj/examples/mixin/CMakeLists.txt @@ -17,6 +17,7 @@ add_executable(mixin ${MIXIN_CC_SOURCES}) get_target_property(eobj_LIB_FILE eobj LOCATION) target_link_libraries(mixin ${EINA_LIBRARIES} + ${EINA_LDFLAGS_OTHER} ${eobj_LIB_FILE} ) diff --git a/legacy/eobj/examples/signals/CMakeLists.txt b/legacy/eobj/examples/signals/CMakeLists.txt index 151fa7a682..98cdd902d1 100644 --- a/legacy/eobj/examples/signals/CMakeLists.txt +++ b/legacy/eobj/examples/signals/CMakeLists.txt @@ -14,6 +14,7 @@ add_executable(signals ${SIGNALS_CC_SOURCES}) get_target_property(eobj_LIB_FILE eobj LOCATION) target_link_libraries(signals ${EINA_LIBRARIES} + ${EINA_LDFLAGS_OTHER} ${eobj_LIB_FILE} ) diff --git a/legacy/eobj/lib/CMakeLists.txt b/legacy/eobj/lib/CMakeLists.txt index 3ac83b6227..7063c90335 100644 --- a/legacy/eobj/lib/CMakeLists.txt +++ b/legacy/eobj/lib/CMakeLists.txt @@ -10,6 +10,7 @@ include_directories( add_library(eobj SHARED ${EOBJ_CC_SOURCES}) target_link_libraries(eobj ${EINA_LIBRARIES} + ${EINA_LDFLAGS_OTHER} ${EFL_COVERAGE_LIBS} ) diff --git a/legacy/eobj/tests/CMakeLists.txt b/legacy/eobj/tests/CMakeLists.txt index 82221e2676..10f8135770 100644 --- a/legacy/eobj/tests/CMakeLists.txt +++ b/legacy/eobj/tests/CMakeLists.txt @@ -12,8 +12,6 @@ if (CHECK_ENABLED) include_directories( ${EINA_INCLUDE_DIRS} - ${EVAS_INCLUDE_DIRS} - ${ELEMENTARY_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/lib ${CHECK_INCLUDE_DIRS} ) @@ -21,8 +19,7 @@ if (CHECK_ENABLED) get_target_property(eobj_LIB_FILE eobj LOCATION) target_link_libraries(eobj_suite ${EINA_LIBRARIES} - ${EVAS_LIBRARIES} - ${ELEMENTARY_LIBRARIES} + ${EINA_LDFLAGS_OTHER} ${eobj_LIB_FILE} ${CHECK_LIBRARIES} )