diff options
author | Marvin W <git@larma.de> | 2017-03-11 23:20:25 +0100 |
---|---|---|
committer | Marvin W <git@larma.de> | 2017-03-11 23:58:34 +0100 |
commit | cd6b904e970291a63551d0f1d80bbd550e778ec8 (patch) | |
tree | 21842cccc9115462e4cd6cd23e37e8cca9e14523 /libdino/CMakeLists.txt | |
parent | 083df7e73775d8f81e380f12f6d63c2012a6b617 (diff) | |
download | dino-cd6b904e970291a63551d0f1d80bbd550e778ec8.tar.gz dino-cd6b904e970291a63551d0f1d80bbd550e778ec8.zip |
CMake: merge created header+vapi files into a single directory
Diffstat (limited to 'libdino/CMakeLists.txt')
-rw-r--r-- | libdino/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libdino/CMakeLists.txt b/libdino/CMakeLists.txt index e638b3c8..ece8a56f 100644 --- a/libdino/CMakeLists.txt +++ b/libdino/CMakeLists.txt @@ -129,9 +129,9 @@ SOURCES src/ui/unified_window.vala src/ui/util.vala CUSTOM_VAPIS - "${CMAKE_BINARY_DIR}/xmpp-vala/xmpp-vala.vapi" - "${CMAKE_BINARY_DIR}/qlite/qlite.vapi" - "${CMAKE_BINARY_DIR}/gpgme-vala/gpgme.vapi" + "${CMAKE_BINARY_DIR}/exports/xmpp-vala.vapi" + "${CMAKE_BINARY_DIR}/exports/qlite.vapi" + "${CMAKE_BINARY_DIR}/exports/gpgme.vapi" PACKAGES ${LIBDINO_PACKAGES} GENERATE_VAPI @@ -142,11 +142,11 @@ GRESOURCES ${LIBDINO_GRESOURCES_XML} OPTIONS --target-glib=2.38 - -g + ${GLOBAL_DEBUG_FLAGS} --thread ) -set(CFLAGS ${VALA_CFLAGS} ${LIBDINO_CFLAGS} -I${CMAKE_BINARY_DIR}/xmpp-vala -I${CMAKE_BINARY_DIR}/qlite -I${CMAKE_BINARY_DIR}/gpgme-vala -I${CMAKE_SOURCE_DIR}/gpgme-vala/src) +set(CFLAGS ${VALA_CFLAGS} ${LIBDINO_CFLAGS}) add_definitions(${CFLAGS}) add_library(libdino SHARED ${LIBDINO_VALA_C} ${LIBDINO_GRESOURCES_TARGET}) add_dependencies(libdino xmpp-vala-vapi qlite-vapi gpgme-vapi) @@ -155,5 +155,5 @@ set_target_properties(libdino PROPERTIES PREFIX "") add_custom_target(dino-vapi DEPENDS - ${CMAKE_BINARY_DIR}/libdino/dino.vapi + ${CMAKE_BINARY_DIR}/exports/dino.vapi ) |