summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@yahoo.com>2018-12-27 11:17:02 +0200
committerDaniel Zaoui <daniel.zaoui@yahoo.com>2018-12-27 11:18:18 +0200
commitfffe4fe929cdaa4b26e682fffb6c49776f301b3a (patch)
tree6676c5a5be3080ec26397ecc2a259af24e29fb17
parent1547a8643286289212c446f5c910423deb622f00 (diff)
Build: depend on pkg-config to find the EFL components
In EFL, meson build doesn't generate the cmake files for the components, meaning ea_gen compilation will fail in not finding them. To fix this, we use pc files
-rw-r--r--CMakeLists.txt22
-rw-r--r--src/bin/CMakeLists.txt2
-rw-r--r--src/lib/CMakeLists.txt3
-rw-r--r--src/tests/CMakeLists.txt2
4 files changed, 15 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ccb9d1..d0a0c23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,20 +8,20 @@ include(CTest)
8ENABLE_TESTING() 8ENABLE_TESTING()
9add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure) 9add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure)
10 10
11find_package(PkgConfig REQUIRED)
11find_package(Check) 12find_package(Check)
12find_package(Eina REQUIRED)
13find_package(Eet REQUIRED)
14find_package(Ecore REQUIRED Evas)
15find_package(Eo REQUIRED)
16find_package(Eolian REQUIRED)
17find_package(Efl REQUIRED)
18find_package(Evas REQUIRED)
19find_package(Elementary REQUIRED)
20find_package(Emotion REQUIRED)
21find_package(Exactness REQUIRED)
22find_package(Efreet REQUIRED)
23find_package(JSON-C REQUIRED) 13find_package(JSON-C REQUIRED)
24 14
15pkg_check_modules(EINA REQUIRED eina)
16pkg_check_modules(EET REQUIRED eet)
17pkg_check_modules(ECORE REQUIRED ecore)
18pkg_check_modules(EO REQUIRED eo)
19pkg_check_modules(EOLIAN REQUIRED eolian)
20pkg_check_modules(EFL REQUIRED efl)
21pkg_check_modules(EVAS REQUIRED evas)
22pkg_check_modules(ELEMENTARY REQUIRED elementary)
23pkg_check_modules(EXACTNESS REQUIRED exactness)
24
25add_subdirectory(src/lib) 25add_subdirectory(src/lib)
26add_subdirectory(src/bin) 26add_subdirectory(src/bin)
27add_subdirectory(src/tests) 27add_subdirectory(src/tests)
diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
index 9c44f9a..153361c 100644
--- a/src/bin/CMakeLists.txt
+++ b/src/bin/CMakeLists.txt
@@ -1,6 +1,6 @@
1set(CMAKE_BUILD_TYPE Debug) 1set(CMAKE_BUILD_TYPE Debug)
2 2
3link_directories (${PC_LIBELEMENTARY_LIBRARY_DIRS}) 3link_directories (${ELEMENTARY_LIBRARY_DIRS})
4 4
5include_directories( 5include_directories(
6 ${CMAKE_SOURCE_DIR}/src/lib 6 ${CMAKE_SOURCE_DIR}/src/lib
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 5e990ed..42b1907 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -1,6 +1,6 @@
1set(CMAKE_BUILD_TYPE Debug) 1set(CMAKE_BUILD_TYPE Debug)
2 2
3link_directories (${PC_LIBELEMENTARY_LIBRARY_DIRS}) 3link_directories (${ELEMENTARY_LIBRARY_DIRS})
4 4
5include_directories (${CMAKE_SOURCE_DIR}/src/lib) 5include_directories (${CMAKE_SOURCE_DIR}/src/lib)
6include_directories(${CMAKE_CURRENT_BINARY_DIR}) 6include_directories(${CMAKE_CURRENT_BINARY_DIR})
@@ -24,6 +24,7 @@ add_library(ea_spy SHARED spy_preload.c)
24 24
25target_link_libraries(ea_spy 25target_link_libraries(ea_spy
26 ${EINA_LIBRARIES} 26 ${EINA_LIBRARIES}
27 ${EINA_LIBRARIES}
27 ${EO_LIBRARIES} 28 ${EO_LIBRARIES}
28 ${EOLIAN_LIBRARIES} 29 ${EOLIAN_LIBRARIES}
29 ${EVAS_LIBRARIES} 30 ${EVAS_LIBRARIES}
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 1f1cb8d..d3d54b4 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -4,7 +4,7 @@ if(CHECK_FOUND)
4 4
5include_directories (${CMAKE_SOURCE_DIR}/src/lib) 5include_directories (${CMAKE_SOURCE_DIR}/src/lib)
6 6
7link_directories (${CMAKE_SOURCE_DIR}/src/lib) 7link_directories (${CMAKE_SOURCE_DIR}/src/lib ${ELEMENTARY_LIBRARY_DIRS})
8 8
9set(TARGET suite) 9set(TARGET suite)
10 10