diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2012-03-21 16:57:55 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2012-03-21 16:57:55 +0100 |
| commit | b2470635500817bd045810bb387e69bd4588cee6 (patch) | |
| tree | 76b448541d1f24d95b6ee27b68f68306c2e6f262 | |
| parent | e56445a8a9dafabc81ca8715626f225b53262be5 (diff) | |
| download | uca-b2470635500817bd045810bb387e69bd4588cee6.tar.gz uca-b2470635500817bd045810bb387e69bd4588cee6.tar.bz2 uca-b2470635500817bd045810bb387e69bd4588cee6.tar.xz uca-b2470635500817bd045810bb387e69bd4588cee6.zip | |
Merge patch from Volker Kaiser
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/uca-camera.h | 4 | ||||
| -rw-r--r-- | src/uca.pc.in | 2 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 6 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b825b1a..cfa5f9c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -128,7 +128,7 @@ set(VERSION ${UCA_VERSION_STRING}) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/uca.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/uca.pc" @ONLY IMMEDIATE) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/uca.pc DESTINATION lib/pkgconfig) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/uca.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) set(CPACK_PACKAGE_DESCRIPTION "Unified Camera Access library") diff --git a/src/uca-camera.h b/src/uca-camera.h index c10173b..23a0c41 100644 --- a/src/uca-camera.h +++ b/src/uca-camera.h @@ -20,6 +20,8 @@ #include <glib-object.h> +G_BEGIN_DECLS + #define UCA_TYPE_CAMERA (uca_camera_get_type()) #define UCA_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), UCA_TYPE_CAMERA, UcaCamera)) #define UCA_IS_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), UCA_TYPE_CAMERA)) @@ -87,4 +89,6 @@ void uca_camera_set_grab_func(UcaCamera *camera, UcaCameraGrabFunc func, gpointe GType uca_camera_get_type(void); +G_END_DECLS + #endif diff --git a/src/uca.pc.in b/src/uca.pc.in index 6401368..26434f6 100644 --- a/src/uca.pc.in +++ b/src/uca.pc.in @@ -9,5 +9,5 @@ includedir_new=@includedir@ Name: libuca Description: @UCA_DESCRIPTION@ Version: @VERSION@ -Libs: -L${libdir} -luca +Libs: -L${libdir} -luca-gobject Cflags: -I${includedir_old} -I${includedir_new} diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c14e7ce..50aa2b8 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -7,6 +7,8 @@ find_package(PkgConfig) pkg_check_modules(GTK2 gtk+-2.0) pkg_check_modules(GTHREAD2 gthread-2.0) +pkg_check_modules(GLIB2 glib-2.0>=2.24 REQUIRED) +pkg_check_modules(GOBJECT2 gobject-2.0>=2.24 REQUIRED) include_directories(${CMAKE_SOURCE_DIR}/src) @@ -20,7 +22,7 @@ add_executable(grab grab.c) #add_executable(benchmark benchmark.c) #target_link_libraries(enum uca) -target_link_libraries(grab uca-gobject) +target_link_libraries(grab uca-gobject ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES}) #target_link_libraries(grab-async uca) #target_link_libraries(benchmark uca) @@ -36,8 +38,6 @@ target_link_libraries(grab uca-gobject) # # >>> TEMPORARY TEST EXECUTABLE <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -pkg_check_modules(GLIB2 glib-2.0>=2.24 REQUIRED) -pkg_check_modules(GOBJECT2 gobject-2.0>=2.24 REQUIRED) include_directories( ${GLIB2_INCLUDE_DIRS} |