From 7b4979cffd2041e51cb623a5fb7644fb1f859eee Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Wed, 19 Sep 2012 10:04:57 +0200 Subject: Add G_BEGIN/END_DECL to fix #131 --- src/cameras/uca-mock-camera.h | 4 ++++ src/cameras/uca-pco-camera.h | 4 ++++ src/cameras/uca-pf-camera.h | 4 ++++ src/cameras/uca-ufo-camera.h | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/src/cameras/uca-mock-camera.h b/src/cameras/uca-mock-camera.h index aa196db..92030f8 100644 --- a/src/cameras/uca-mock-camera.h +++ b/src/cameras/uca-mock-camera.h @@ -21,6 +21,8 @@ #include #include "uca-camera.h" +G_BEGIN_DECLS + #define UCA_TYPE_MOCK_CAMERA (uca_mock_camera_get_type()) #define UCA_MOCK_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), UCA_TYPE_MOCK_CAMERA, UcaMockCamera)) #define UCA_IS_MOCK_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), UCA_TYPE_MOCK_CAMERA)) @@ -60,4 +62,6 @@ UcaMockCamera *uca_mock_camera_new(GError **error); GType uca_mock_camera_get_type(void); +G_END_DECLS + #endif diff --git a/src/cameras/uca-pco-camera.h b/src/cameras/uca-pco-camera.h index 87f4277..fdb709a 100644 --- a/src/cameras/uca-pco-camera.h +++ b/src/cameras/uca-pco-camera.h @@ -21,6 +21,8 @@ #include #include "uca-camera.h" +G_BEGIN_DECLS + #define UCA_TYPE_PCO_CAMERA (uca_pco_camera_get_type()) #define UCA_PCO_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), UCA_TYPE_PCO_CAMERA, UcaPcoCamera)) #define UCA_IS_PCO_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), UCA_TYPE_PCO_CAMERA)) @@ -86,4 +88,6 @@ UcaPcoCamera *uca_pco_camera_new(GError **error); GType uca_pco_camera_get_type(void); +G_END_DECLS + #endif diff --git a/src/cameras/uca-pf-camera.h b/src/cameras/uca-pf-camera.h index 11ac55a..7e3fe2c 100644 --- a/src/cameras/uca-pf-camera.h +++ b/src/cameras/uca-pf-camera.h @@ -21,6 +21,8 @@ #include #include "uca-camera.h" +G_BEGIN_DECLS + #define UCA_TYPE_PF_CAMERA (uca_pf_camera_get_type()) #define UCA_PF_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), UCA_TYPE_PF_CAMERA, UcaPfCamera)) #define UCA_IS_PF_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), UCA_TYPE_PF_CAMERA)) @@ -69,4 +71,6 @@ UcaPfCamera *uca_pf_camera_new(GError **error); GType uca_pf_camera_get_type(void); +G_END_DECLS + #endif diff --git a/src/cameras/uca-ufo-camera.h b/src/cameras/uca-ufo-camera.h index e97eb17..0b52ffb 100644 --- a/src/cameras/uca-ufo-camera.h +++ b/src/cameras/uca-ufo-camera.h @@ -21,6 +21,8 @@ #include #include "uca-camera.h" +G_BEGIN_DECLS + #define UCA_TYPE_UFO_CAMERA (uca_ufo_camera_get_type()) #define UCA_UFO_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), UCA_TYPE_UFO_CAMERA, UcaUfoCamera)) #define UCA_IS_UFO_CAMERA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), UCA_TYPE_UFO_CAMERA)) @@ -71,4 +73,6 @@ UcaUfoCamera *uca_ufo_camera_new(GError **error); GType uca_ufo_camera_get_type(void); +G_END_DECLS + #endif -- cgit v1.2.3 From 10d4f336618cc753382efaaa95e69736cc2b7773 Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Wed, 19 Sep 2012 14:02:29 +0200 Subject: Bump to release version 1.0 --- CMakeLists.txt | 4 ++-- NEWS | 4 ++-- cmake/FindPylon.cmake | 5 ----- test/CMakeLists.txt | 2 -- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ade68ad..48592fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 2.8) project(uca C) set(TARNAME "libuca") -set(UCA_VERSION_MAJOR "0") -set(UCA_VERSION_MINOR "6") +set(UCA_VERSION_MAJOR "1") +set(UCA_VERSION_MINOR "0") set(UCA_VERSION_PATCH "0") set(UCA_DESCRIPTION "Unified Camera Access") diff --git a/NEWS b/NEWS index c503b1c..4f3c174 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ -Changes in libuca 0.6.0 -======================= +Changes in libuca 1.0 aka 0.6 +============================= GObject Type System ------------------- diff --git a/cmake/FindPylon.cmake b/cmake/FindPylon.cmake index 01cee02..a77e613 100644 --- a/cmake/FindPylon.cmake +++ b/cmake/FindPylon.cmake @@ -13,8 +13,6 @@ find_package(PkgConfig) find_package(PackageHandleStandardArgs) if (NOT "$ENV{PYLON_ROOT}" STREQUAL "") - message("PYLON_ROOT=$ENV{PYLON_ROOT}") - find_library(YAT_LIB yat ${YAT_LIBRARY_DIRS}) pkg_check_modules(LIBPYLONCAM pyloncam>=0.1) @@ -34,7 +32,4 @@ if (NOT "$ENV{PYLON_ROOT}" STREQUAL "") LIBPYLONCAM_INCLUDEDIR LIBPYLONCAM_LIBRARIES LIBPYLONCAM_LIBDIR) - -else() - message("Environment variable PYLON_ROOT not found! => unable to build pylon camera support") endif() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2b46cbf..ce45d71 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -23,8 +23,6 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../src ) -message("${CMAKE_CURRENT_SOURCE_DIR}") - if (HAVE_PYLON_CAMERA) set(GENICAM_ROOT $ENV{PYLON_ROOT}/genicam) # check for 32/64 bit -- cgit v1.2.3 From 178298f53bd6bf68cda6f2780281f0893ef2dc73 Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Wed, 26 Sep 2012 12:20:36 +0200 Subject: Set SO version to major not minor version Fortunately, no one really used the 0.6-rc1 version which would have a higher SO version than 1.0. --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9508c5c..05fd37f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -155,7 +155,7 @@ add_library(uca SHARED set_target_properties(uca PROPERTIES VERSION ${UCA_ABI_VERSION} - SOVERSION ${UCA_VERSION_MINOR}) + SOVERSION ${UCA_VERSION_MAJOR}) target_link_libraries(uca ${uca_LIBS}) -- cgit v1.2.3 From 5d99f2736d2340f50dadbfcb7e0db822372d3b72 Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Wed, 26 Sep 2012 12:33:56 +0200 Subject: Bump version to prepare for SO fix --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48592fd..e60cfe5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(uca C) set(TARNAME "libuca") set(UCA_VERSION_MAJOR "1") set(UCA_VERSION_MINOR "0") -set(UCA_VERSION_PATCH "0") +set(UCA_VERSION_PATCH "1") set(UCA_DESCRIPTION "Unified Camera Access") set(UCA_VERSION_STRING "${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}") -- cgit v1.2.3 From ee6b7a941f7ef7cdcc92c04b80a683d7370f52bd Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Wed, 26 Sep 2012 12:35:55 +0200 Subject: Bump version for next fixes --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e60cfe5..acf0386 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(uca C) set(TARNAME "libuca") set(UCA_VERSION_MAJOR "1") set(UCA_VERSION_MINOR "0") -set(UCA_VERSION_PATCH "1") +set(UCA_VERSION_PATCH "2-dev") set(UCA_DESCRIPTION "Unified Camera Access") set(UCA_VERSION_STRING "${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}") -- cgit v1.2.3