aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2022-03-24 10:25:04 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2022-03-24 10:25:04 +0100
commite56a633cc621ff211a7388afa4b2548b7af5ed91 (patch)
tree99048b852839bd27c98c7ef705f46e63b9458914
parentd87cc10393cdc8b88141c6ce3245b0f9b9b217f0 (diff)
parent2e1c040908f33c7ed1bc3192b98d72c3d179d87d (diff)
downloadayatana-ido-main.tar.gz
ayatana-ido-main.tar.bz2
ayatana-ido-main.zip
Merge branch 'ricotz-main'HEADmain
Attributes GH PR #60: https://github.com/AyatanaIndicators/ayatana-ido/pull/60
-rw-r--r--src/CMakeLists.txt16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eea4b0a..1f03954 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -106,7 +106,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.so" DESTINATION "
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.so.0" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.so.0.0.0" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
-# ayatana-ido3-0.4.gir
+# AyatanaIdo3-0.4.gir
find_package(GObjectIntrospection REQUIRED QUIET)
@@ -136,6 +136,7 @@ if (INTROSPECTION_FOUND)
--pkg=gtk+-3.0
--warn-all
--include=Gtk-3.0
+ --c-include="libayatana-ido/libayatana-ido.h"
--library="ayatana-ido3-0.4"
--library-path=${CMAKE_CURRENT_BINARY_DIR}
--output "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir"
@@ -143,7 +144,7 @@ if (INTROSPECTION_FOUND)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0")
- # ayatana-ido3-0.4.typelib
+ # AyatanaIdo3-0.4.typelib
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.typelib"
@@ -158,27 +159,26 @@ if (INTROSPECTION_FOUND)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.typelib" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/girepository-1.0")
-
- # ayatana-ido3-0.4.vapi
+ # libayatana-ido3-0.4.vapi
find_package(Vala REQUIRED QUIET)
if (VALA_FOUND)
add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.vapi"
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.vapi"
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.typelib"
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND
${VAPI_GEN}
- --library=AyatanaIdo3-0.4
+ --library=libayatana-ido3-0.4
--pkg gtk+-3.0
AyatanaIdo3-0.4.gir
)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.vapi" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/vala/vapi")
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.vapi" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/vala/vapi")
- add_custom_target("src" ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.vapi")
+ add_custom_target("src" ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.vapi")
endif ()