diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-03-18 14:27:26 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-03-18 14:27:47 +0000 |
commit | 45352310f971c47ca8a035bcfe17b4e60073d9f7 (patch) | |
tree | 1794eeab9b89e51385992f7ed8793f022f781a7a | |
parent | beac5d2e25324ca9cc82d0e3b364512258af3567 (diff) | |
download | wayland-ivi-extension-baserock/pedroalvarez/1.9.0-fix-race-condition.tar.gz |
buildsystem: make example programs link to the generated protocols librarybaserock/pedroalvarez/1.9.0-fix-race-condition
This avoids redefining the generation of protocol files
and fixes builds with parallel make (the header generation
was missing).
Signed-off-by: Frederico Cadete <frederico.cadete@awtce.be>
-rw-r--r-- | ivi-layermanagement-examples/multi-touch-viewer/CMakeLists.txt | 10 | ||||
-rw-r--r-- | ivi-layermanagement-examples/simple-ivi-share/CMakeLists.txt | 19 |
2 files changed, 2 insertions, 27 deletions
diff --git a/ivi-layermanagement-examples/multi-touch-viewer/CMakeLists.txt b/ivi-layermanagement-examples/multi-touch-viewer/CMakeLists.txt index 42f7d22..87623fe 100644 --- a/ivi-layermanagement-examples/multi-touch-viewer/CMakeLists.txt +++ b/ivi-layermanagement-examples/multi-touch-viewer/CMakeLists.txt @@ -25,14 +25,6 @@ project (generate-protocol-src) find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) -add_custom_command( - OUTPUT ivi-application-protocol.c - COMMAND ${WAYLAND_SCANNER_EXECUTABLE} code - < ${CMAKE_SOURCE_DIR}/protocol/ivi-application.xml - > ${CMAKE_CURRENT_BINARY_DIR}/ivi-application-protocol.c - DEPENDS ${CMAKE_SOURCE_DIR}/protocol/ivi-application.xml -) - ################################################################ project (multi-touch-viewer) @@ -61,6 +53,7 @@ link_directories( SET(LIBS ${LIBS} + ivi-extension-protocol ${GLESv2_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_EGL_LIBRARIES} @@ -82,7 +75,6 @@ set(HEADER_FILES add_executable(${PROJECT_NAME} ${SRC_FILES} - ${CMAKE_CURRENT_BINARY_DIR}/ivi-application-protocol.c ) add_dependencies(${PROJECT_NAME} ${LIBS}) diff --git a/ivi-layermanagement-examples/simple-ivi-share/CMakeLists.txt b/ivi-layermanagement-examples/simple-ivi-share/CMakeLists.txt index 248eafd..7401d08 100644 --- a/ivi-layermanagement-examples/simple-ivi-share/CMakeLists.txt +++ b/ivi-layermanagement-examples/simple-ivi-share/CMakeLists.txt @@ -25,22 +25,6 @@ project (generate-protocol-src) find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) -add_custom_command( - OUTPUT ivi-application-protocol.c - COMMAND ${WAYLAND_SCANNER_EXECUTABLE} code - < ${CMAKE_SOURCE_DIR}/protocol/ivi-application.xml - > ${CMAKE_CURRENT_BINARY_DIR}/ivi-application-protocol.c - DEPENDS ${CMAKE_SOURCE_DIR}/protocol/ivi-application.xml -) - -add_custom_command( - OUTPUT ivi-share-protocol.c - COMMAND ${WAYLAND_SCANNER_EXECUTABLE} code - < ${CMAKE_SOURCE_DIR}/protocol/ivi-share.xml - > ${CMAKE_CURRENT_BINARY_DIR}/ivi-share-protocol.c - DEPENDS ${CMAKE_SOURCE_DIR}/protocol/ivi-share.xml -) - ################################################################ project (simple-ivi-share) @@ -69,6 +53,7 @@ link_directories( SET(LIBS ${LIBS} + ivi-extension-protocol ${GLESv2_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_EGL_LIBRARIES} @@ -82,8 +67,6 @@ SET(SRC_FILES add_executable(${PROJECT_NAME} ${SRC_FILES} - ${CMAKE_CURRENT_BINARY_DIR}/ivi-application-protocol.c - ${CMAKE_CURRENT_BINARY_DIR}/ivi-share-protocol.c ) add_dependencies(${PROJECT_NAME} ${LIBS}) |