enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

Eobj: Fixed issue with FindEina.cmake and things using it. 

SVN revision: 70406
This commit is contained in:
Tom Hacohen 2012-04-23 08:09:49 +00:00
parent a5742a341c
commit 1390200ede
10 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/eobj/cmake/Modules/FindEina.cmake
View File

@ -3,11 +3,13 @@
# EINA_FOUND - System has eina # EINA_FOUND - System has eina
# EINA_INCLUDE_DIRS - The eina include directories # EINA_INCLUDE_DIRS - The eina include directories
# EINA_LIBRARIES - The libraries needed to use eina # 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 # EINA_DEFINITIONS - Compiler switches required for using eina
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules(PC_LIBEINA QUIET eina) pkg_check_modules(PC_LIBEINA QUIET eina)
set(EINA_DEFINITIONS ${PC_LIBEINA_CFLAGS_OTHER}) set(EINA_DEFINITIONS ${PC_LIBEINA_CFLAGS_OTHER})
set(EINA_LDFLAGS_OTHER ${PC_LIBEINA_LDFLAGS_OTHER})
find_path(EINA_INCLUDE_DIR Eina.h find_path(EINA_INCLUDE_DIR Eina.h
HINTS ${PC_LIBEINA_INCLUDEDIR} ${PC_LIBEINA_INCLUDE_DIRS} HINTS ${PC_LIBEINA_INCLUDEDIR} ${PC_LIBEINA_INCLUDE_DIRS}

1
legacy/eobj/examples/access/CMakeLists.txt
View File

@ -15,6 +15,7 @@ add_executable(access ${ACCESS_CC_SOURCES})
get_target_property(eobj_LIB_FILE eobj LOCATION) get_target_property(eobj_LIB_FILE eobj LOCATION)
target_link_libraries(access target_link_libraries(access
${EINA_LIBRARIES} ${EINA_LIBRARIES}
${EINA_LDFLAGS_OTHER}
${eobj_LIB_FILE} ${eobj_LIB_FILE}
) )

1
legacy/eobj/examples/composite_objects/CMakeLists.txt
View File

@ -15,6 +15,7 @@ add_executable(composite_objects ${COMPOSITE_OBJECTS_CC_SOURCES})
get_target_property(eobj_LIB_FILE eobj LOCATION) get_target_property(eobj_LIB_FILE eobj LOCATION)
target_link_libraries(composite_objects target_link_libraries(composite_objects
${EINA_LIBRARIES} ${EINA_LIBRARIES}
${EINA_LDFLAGS_OTHER}
${eobj_LIB_FILE} ${eobj_LIB_FILE}
) )

1
legacy/eobj/examples/constructors/CMakeLists.txt
View File

@ -20,6 +20,7 @@ add_executable(constructors ${CONSTRUCTORS_CC_SOURCES})
get_target_property(eobj_LIB_FILE eobj LOCATION) get_target_property(eobj_LIB_FILE eobj LOCATION)
target_link_libraries(constructors target_link_libraries(constructors
${EINA_LIBRARIES} ${EINA_LIBRARIES}
${EINA_LDFLAGS_OTHER}
${eobj_LIB_FILE} ${eobj_LIB_FILE}
) )

1
legacy/eobj/examples/evas/CMakeLists.txt
View File

@ -18,6 +18,7 @@ add_executable(evas ${EVAS_CC_SOURCES})
get_target_property(eobj_LIB_FILE eobj LOCATION) get_target_property(eobj_LIB_FILE eobj LOCATION)
target_link_libraries(evas target_link_libraries(evas
${EINA_LIBRARIES} ${EINA_LIBRARIES}
${EINA_LDFLAGS_OTHER}
${EVAS_LIBRARIES} ${EVAS_LIBRARIES}
${ELEMENTARY_LIBRARIES} ${ELEMENTARY_LIBRARIES}
${eobj_LIB_FILE} ${eobj_LIB_FILE}

1
legacy/eobj/examples/function_overrides/CMakeLists.txt
View File

@ -17,6 +17,7 @@ add_executable(function_overrides ${FUNCTION_OVERRIDES_CC_SOURCES})
get_target_property(eobj_LIB_FILE eobj LOCATION) get_target_property(eobj_LIB_FILE eobj LOCATION)
target_link_libraries(function_overrides target_link_libraries(function_overrides
${EINA_LIBRARIES} ${EINA_LIBRARIES}
${EINA_LDFLAGS_OTHER}
${eobj_LIB_FILE} ${eobj_LIB_FILE}
) )

1
legacy/eobj/examples/mixin/CMakeLists.txt
View File

@ -17,6 +17,7 @@ add_executable(mixin ${MIXIN_CC_SOURCES})
get_target_property(eobj_LIB_FILE eobj LOCATION) get_target_property(eobj_LIB_FILE eobj LOCATION)
target_link_libraries(mixin target_link_libraries(mixin
${EINA_LIBRARIES} ${EINA_LIBRARIES}
${EINA_LDFLAGS_OTHER}
${eobj_LIB_FILE} ${eobj_LIB_FILE}
) )

1
legacy/eobj/examples/signals/CMakeLists.txt
View File

@ -14,6 +14,7 @@ add_executable(signals ${SIGNALS_CC_SOURCES})
get_target_property(eobj_LIB_FILE eobj LOCATION) get_target_property(eobj_LIB_FILE eobj LOCATION)
target_link_libraries(signals target_link_libraries(signals
${EINA_LIBRARIES} ${EINA_LIBRARIES}
${EINA_LDFLAGS_OTHER}
${eobj_LIB_FILE} ${eobj_LIB_FILE}
) )

1
legacy/eobj/lib/CMakeLists.txt
View File

@ -10,6 +10,7 @@ include_directories(
add_library(eobj SHARED ${EOBJ_CC_SOURCES}) add_library(eobj SHARED ${EOBJ_CC_SOURCES})
target_link_libraries(eobj target_link_libraries(eobj
${EINA_LIBRARIES} ${EINA_LIBRARIES}
${EINA_LDFLAGS_OTHER}
${EFL_COVERAGE_LIBS} ${EFL_COVERAGE_LIBS}
) )

5
legacy/eobj/tests/CMakeLists.txt
View File

@ -12,8 +12,6 @@ if (CHECK_ENABLED)
include_directories( include_directories(
${EINA_INCLUDE_DIRS} ${EINA_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
${ELEMENTARY_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/lib
${CHECK_INCLUDE_DIRS} ${CHECK_INCLUDE_DIRS}
) )
@ -21,8 +19,7 @@ if (CHECK_ENABLED)
get_target_property(eobj_LIB_FILE eobj LOCATION) get_target_property(eobj_LIB_FILE eobj LOCATION)
target_link_libraries(eobj_suite target_link_libraries(eobj_suite
${EINA_LIBRARIES} ${EINA_LIBRARIES}
${EVAS_LIBRARIES} ${EINA_LDFLAGS_OTHER}
${ELEMENTARY_LIBRARIES}
${eobj_LIB_FILE} ${eobj_LIB_FILE}
${CHECK_LIBRARIES} ${CHECK_LIBRARIES}
) )