diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-09-19 14:02:29 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-09-19 14:02:29 +0200 |
| commit | 10d4f336618cc753382efaaa95e69736cc2b7773 (patch) | |
| tree | b6fde855921076eb57fc1d5a2a05586a5efb033a | |
| parent | 7b4979cffd2041e51cb623a5fb7644fb1f859eee (diff) | |
| download | uca-10d4f336618cc753382efaaa95e69736cc2b7773.tar.gz uca-10d4f336618cc753382efaaa95e69736cc2b7773.tar.bz2 uca-10d4f336618cc753382efaaa95e69736cc2b7773.tar.xz uca-10d4f336618cc753382efaaa95e69736cc2b7773.zip | |
Bump to release version 1.0
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | cmake/FindPylon.cmake | 5 | ||||
| -rw-r--r-- | 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") @@ -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 |