aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-06-08 15:51:25 +0200
committerRobert Tari <robert@tari.in>2021-06-08 15:51:25 +0200
commit54f117490ba595a437ea2255689127a9d118284c (patch)
tree0bfaabedaa2ecef44bca504840fc64d11f65e43c
parente11bf6e8d7795cb76fea3b83ed1d6fed5a86e1b9 (diff)
parent7f9c75d88fe6d9f710d60885253b0c748cf096d8 (diff)
downloadayatana-ido-54f117490ba595a437ea2255689127a9d118284c.tar.gz
ayatana-ido-54f117490ba595a437ea2255689127a9d118284c.tar.bz2
ayatana-ido-54f117490ba595a437ea2255689127a9d118284c.zip
Merge branch 'sunweaver-pr/conditional-build-of-GIR-and-VAPI'
Attributes GH PR #42: https://github.com/AyatanaIndicators/ayatana-ido/pull/42
-rw-r--r--README.md21
-rw-r--r--data/CMakeLists.txt2
-rw-r--r--data/libayatana-ido3-0.4.pc.in2
-rw-r--r--src/CMakeLists.txt159
4 files changed, 106 insertions, 78 deletions
diff --git a/README.md b/README.md
index 5d8c7a7..adcd2d6 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,26 @@ https://ayatana-indicators.org
## About this Software Component
-TODO
+Ayatana IDO provides custom GTK menu widgets for Ayatana System Indicators.
+Below is a list of currently available menu item types:
+
+- Basic menu item
+- Scale menu item
+- Entry menu item
+- Source menu item
+- Location menu item
+- Switch menu item
+- Alarm menu item
+- Media player menu item
+- Switch menu item
+- Application menu item
+- Playback menu item
+- Timestamp menu item
+- Appointment menu item
+- Progress menu item
+- User menu item
+- Calendar menu item
+- Removable menu item
## License and Copyright
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 2f15bf6..92df24c 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,4 +1,4 @@
# libayatana-ido3-0.4.pc
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libayatana-ido3-0.4.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.pc" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig/")
diff --git a/data/libayatana-ido3-0.4.pc.in b/data/libayatana-ido3-0.4.pc.in
index b1da305..c371c20 100644
--- a/data/libayatana-ido3-0.4.pc.in
+++ b/data/libayatana-ido3-0.4.pc.in
@@ -8,4 +8,4 @@ Description: Ayatana Indicator Display Objects
Version: @PROJECT_VERSION@
Libs: -L${libdir} -layatana-ido3-0.4
Cflags: -I${includedir}/libayatana-ido3-0.4
-Requires: gtk+-3.0
+Requires: gtk+-3.0 glib-2.0
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 36132fe..9894f90 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,14 +7,14 @@
# idotimeline.h
# libayatana-ido.h
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/ayatanamenuitemfactory.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idocalendarmenuitem.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idoentrymenuitem.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idorange.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idoscalemenuitem.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idoswitchmenuitem.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idotimeline.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/libayatana-ido.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/ayatanamenuitemfactory.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idocalendarmenuitem.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idoentrymenuitem.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idorange.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idoscalemenuitem.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idoswitchmenuitem.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/idotimeline.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/libayatana-ido.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-ido3-0.4/libayatana-ido")
set(HEADERS
idorange.h
@@ -102,75 +102,84 @@ target_include_directories("ayatana-ido3-0.4" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS
target_include_directories("ayatana-ido3-0.4" PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
target_include_directories("ayatana-ido3-0.4" PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_definitions("ayatana-ido3-0.4" PUBLIC G_LOG_DOMAIN="IDO")
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.so" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.so.0" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.so.0.0.0" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-ido3-0.4.so" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
+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
-set(HEADERS
- idocalendarmenuitem.h
- idoentrymenuitem.h
- idorange.h
- idoscalemenuitem.h
- idoswitchmenuitem.h
- idotimeline.h
-)
-
find_package(GObjectIntrospection REQUIRED QUIET)
-add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir"
- DEPENDS "ayatana-ido3-0.4"
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMAND
- ${INTROSPECTION_SCANNER}
- ${SOURCES} ${HEADERS}
- --symbol-prefix=ido
- --identifier-prefix=Ido
- --namespace=AyatanaIdo3
- --nsversion=0.4
- --quiet
- --pkg=gtk+-3.0
- --warn-all
- --include=Gtk-3.0
- --library="ayatana-ido3-0.4"
- --library-path=${CMAKE_CURRENT_BINARY_DIR}
- --output "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir"
-)
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/gir-1.0")
-
-# ayatana-ido3-0.4.typelib
-
-add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.typelib"
- DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir"
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND
- ${INTROSPECTION_COMPILER}
- --includedir=${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir
- -o "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.typelib"
-)
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.typelib" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/girepository-1.0")
-
-# ayatana-ido3-0.4.vapi
-
-find_package(Vala REQUIRED QUIET)
-
-add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-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
- --pkg gtk+-3.0
- AyatanaIdo3-0.4.gir
-)
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.vapi" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/vala/vapi")
-
-add_custom_target("src" ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.vapi")
+if (INTROSPECTION_FOUND)
+
+ set(HEADERS
+ idocalendarmenuitem.h
+ idoentrymenuitem.h
+ idorange.h
+ idoscalemenuitem.h
+ idoswitchmenuitem.h
+ idotimeline.h
+ )
+
+ add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir"
+ DEPENDS "ayatana-ido3-0.4"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ COMMAND
+ ${INTROSPECTION_SCANNER}
+ ${SOURCES} ${HEADERS}
+ --symbol-prefix=ido
+ --identifier-prefix=Ido
+ --namespace=AyatanaIdo3
+ --nsversion=0.4
+ --quiet
+ --pkg=gtk+-3.0
+ --warn-all
+ --include=Gtk-3.0
+ --library="ayatana-ido3-0.4"
+ --library-path=${CMAKE_CURRENT_BINARY_DIR}
+ --output "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir"
+ )
+
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0")
+
+ # ayatana-ido3-0.4.typelib
+
+ add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.typelib"
+ DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ COMMAND
+ ${INTROSPECTION_COMPILER}
+ --includedir=${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.gir
+ -o "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.typelib"
+ )
+
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.typelib" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/girepository-1.0")
+
+
+ # ayatana-ido3-0.4.vapi
+
+ find_package(Vala REQUIRED QUIET)
+
+ if (VALA_FOUND)
+
+ add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-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
+ --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")
+
+ add_custom_target("src" ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaIdo3-0.4.vapi")
+
+ endif ()
+
+endif ()