summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2012-11-05 14:41:47 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2012-11-05 14:41:47 +0100
commit01aefc6af42c78d3028859770c760fed0057e746 (patch)
treed365a9c380a07c6709a99c3c818d0c25c1ee756f /src
parente0421f87636741286488c903f37712b5c5038d3c (diff)
downloaduca-01aefc6af42c78d3028859770c760fed0057e746.tar.gz
uca-01aefc6af42c78d3028859770c760fed0057e746.tar.bz2
uca-01aefc6af42c78d3028859770c760fed0057e746.tar.xz
uca-01aefc6af42c78d3028859770c760fed0057e746.zip
Add error and enum types to gir and doc generation
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt3
-rw-r--r--src/scangobj.sh.in2
-rw-r--r--src/uca.types.in3
3 files changed, 7 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 160c52b..936679a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -85,6 +85,9 @@ if (INTROSPECTION_SCANNER AND INTROSPECTION_COMPILER)
list(APPEND _gir_input "${CMAKE_CURRENT_SOURCE_DIR}/${_src}")
endforeach()
+ list(APPEND _gir_input "${CMAKE_CURRENT_BINARY_DIR}/uca-enums.h")
+ list(APPEND _gir_input "${CMAKE_CURRENT_BINARY_DIR}/uca-enums.c")
+
add_custom_command(OUTPUT ${GIR_XML}
COMMAND ${INTROSPECTION_SCANNER}
--namespace=Uca
diff --git a/src/scangobj.sh.in b/src/scangobj.sh.in
index 65766b6..088d67e 100644
--- a/src/scangobj.sh.in
+++ b/src/scangobj.sh.in
@@ -1 +1 @@
-LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}:/opt/pylon/lib64:/opt/pylon/genicam/bin/Linux64_x64 CC=gcc CFLAGS="${GTK_DOC_CFLAGS}" LDFLAGS="${GTK_DOC_LDFLAGS} -L${CMAKE_CURRENT_BINARY_DIR} -L${CMAKE_CURRENT_BINARY_DIR} -luca `pkg-config --libs gtk+-2.0`" gtkdoc-scangobj --module=uca
+LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}:/opt/pylon/lib64:/opt/pylon/genicam/bin/Linux64_x64 CC=gcc CFLAGS="${GTK_DOC_CFLAGS}" LDFLAGS="${GTK_DOC_LDFLAGS} -L${CMAKE_CURRENT_BINARY_DIR} -luca `pkg-config --libs gtk+-2.0`" gtkdoc-scangobj --module=uca
diff --git a/src/uca.types.in b/src/uca.types.in
index 7526948..76acc2b 100644
--- a/src/uca.types.in
+++ b/src/uca.types.in
@@ -1,2 +1,5 @@
uca_camera_get_type
+uca_camera_error_get_type
+uca_camera_trigger_get_type
uca_plugin_manager_get_type
+uca_unit_get_type