mirror of https://github.com/TakeV-Lambda/dino.git
Rename vala-xmpp library to xmpp-vala
This commit is contained in:
fiaxh
parent
7a1aa8c806
commit
2fe8489d36
|
|
@ -21,5 +21,5 @@ set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
|
||||||
set (VALA_CFLAGS -Wno-deprecated-declarations -Wno-incompatible-pointer-types -Wno-int-conversion)
|
set (VALA_CFLAGS -Wno-deprecated-declarations -Wno-incompatible-pointer-types -Wno-int-conversion)
|
||||||
|
|
||||||
add_subdirectory(qlite)
|
add_subdirectory(qlite)
|
||||||
add_subdirectory(vala-xmpp)
|
add_subdirectory(xmpp-vala)
|
||||||
add_subdirectory(client)
|
add_subdirectory(client)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
find_package(Vala REQUIRED)
|
find_package(Vala REQUIRED)
|
||||||
find_package(PkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
find_package(GPGME REQUIRED)
|
|
||||||
include(${VALA_USE_FILE})
|
include(${VALA_USE_FILE})
|
||||||
include(GlibCompileResourcesSupport)
|
include(GlibCompileResourcesSupport)
|
||||||
|
|
||||||
|
|
@ -125,8 +124,7 @@ SOURCES
|
||||||
src/ui/util.vala
|
src/ui/util.vala
|
||||||
PACKAGES
|
PACKAGES
|
||||||
${CLIENT_PACKAGES}
|
${CLIENT_PACKAGES}
|
||||||
gpgme
|
xmpp-vala
|
||||||
vala-xmpp
|
|
||||||
qlite
|
qlite
|
||||||
GRESOURCES
|
GRESOURCES
|
||||||
${CLIENT_GRESOURCES_XML}
|
${CLIENT_GRESOURCES_XML}
|
||||||
|
|
@ -134,15 +132,15 @@ OPTIONS
|
||||||
--target-glib=2.38
|
--target-glib=2.38
|
||||||
-g
|
-g
|
||||||
--thread
|
--thread
|
||||||
--vapidir=${CMAKE_BINARY_DIR}/vala-xmpp
|
--vapidir=${CMAKE_BINARY_DIR}/xmpp-vala
|
||||||
--vapidir=${CMAKE_BINARY_DIR}/qlite
|
--vapidir=${CMAKE_BINARY_DIR}/qlite
|
||||||
--vapidir=${CMAKE_SOURCE_DIR}/vapi
|
--vapidir=${CMAKE_SOURCE_DIR}/vapi
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
set(CFLAGS ${CLIENT_CFLAGS} ${GPGME_CFLAGS} ${LIBUUID_CFLAGS} -g -I${CMAKE_BINARY_DIR}/vala-xmpp -I${CMAKE_BINARY_DIR}/qlite ${VALA_CFLAGS})
|
set(CFLAGS ${CLIENT_CFLAGS} ${GPGME_CFLAGS} ${LIBUUID_CFLAGS} -g -I${CMAKE_BINARY_DIR}/xmpp-vala -I${CMAKE_BINARY_DIR}/qlite ${VALA_CFLAGS})
|
||||||
add_definitions(${CFLAGS})
|
add_definitions(${CFLAGS})
|
||||||
add_executable(dino ${CLIENT_VALA_C} ${CLIENT_GRESOURCES_TARGET})
|
add_executable(dino ${CLIENT_VALA_C} ${CLIENT_GRESOURCES_TARGET})
|
||||||
add_dependencies(dino vala-xmpp-vapi qlite-vapi)
|
add_dependencies(dino xmpp-vala-vapi qlite-vapi)
|
||||||
target_link_libraries(dino vala-xmpp qlite ${CLIENT_LIBRARIES} ${GPGME_LIBRARIES} ${LIBUUID_LIBRARIES} -lm)
|
target_link_libraries(dino xmpp-vala qlite ${CLIENT_LIBRARIES} ${GPGME_LIBRARIES} ${LIBUUID_LIBRARIES} -lm)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -70,9 +70,9 @@ PACKAGES
|
||||||
${ENGINE_PACKAGES}
|
${ENGINE_PACKAGES}
|
||||||
gpgme
|
gpgme
|
||||||
GENERATE_VAPI
|
GENERATE_VAPI
|
||||||
vala-xmpp
|
xmpp-vala
|
||||||
GENERATE_HEADER
|
GENERATE_HEADER
|
||||||
vala-xmpp
|
xmpp-vala
|
||||||
OPTIONS
|
OPTIONS
|
||||||
--target-glib=2.38
|
--target-glib=2.38
|
||||||
-g
|
-g
|
||||||
|
|
@ -82,11 +82,11 @@ OPTIONS
|
||||||
|
|
||||||
set(CFLAGS ${ENGINE_CFLAGS} ${GPGME_CFLAGS} ${LIBUUID_CFLAGS} -g ${VALA_CFLAGS})
|
set(CFLAGS ${ENGINE_CFLAGS} ${GPGME_CFLAGS} ${LIBUUID_CFLAGS} -g ${VALA_CFLAGS})
|
||||||
add_definitions(${CFLAGS})
|
add_definitions(${CFLAGS})
|
||||||
add_library(vala-xmpp SHARED ${ENGINE_VALA_C})
|
add_library(xmpp-vala SHARED ${ENGINE_VALA_C})
|
||||||
target_link_libraries(vala-xmpp ${ENGINE_LIBRARIES} ${GPGME_LIBRARIES} ${LIBUUID_LIBRARIES})
|
target_link_libraries(xmpp-vala ${ENGINE_LIBRARIES} ${GPGME_LIBRARIES} ${LIBUUID_LIBRARIES})
|
||||||
|
|
||||||
add_custom_target(vala-xmpp-vapi
|
add_custom_target(xmpp-vala-vapi
|
||||||
DEPENDS
|
DEPENDS
|
||||||
${CMAKE_BINARY_DIR}/vala-xmpp/vala-xmpp.vapi
|
${CMAKE_BINARY_DIR}/xmpp-vala/xmpp-vala.vapi
|
||||||
)
|
)
|
||||||
|
|
||||||
Loading…
Reference in New Issue