diff options
| author | Mihael Koep <koep@schneide.com> | 2012-10-19 16:08:05 +0200 |
|---|---|---|
| committer | Mihael Koep <koep@schneide.com> | 2012-10-19 16:08:05 +0200 |
| commit | 420839db21e0bb60f6be72f1924af74b0ffe8224 (patch) | |
| tree | 92b5d777f2d52d46da92b9e3793eab05d13f7d4f /test | |
| parent | b73c7a9550a39566b881244d95cd0cb2a97e82b3 (diff) | |
| parent | ee6b7a941f7ef7cdcc92c04b80a683d7370f52bd (diff) | |
| download | libuca-420839db21e0bb60f6be72f1924af74b0ffe8224.tar.gz libuca-420839db21e0bb60f6be72f1924af74b0ffe8224.tar.bz2 libuca-420839db21e0bb60f6be72f1924af74b0ffe8224.tar.xz libuca-420839db21e0bb60f6be72f1924af74b0ffe8224.zip | |
Merge remote branch 'origin/1.0' into dexela
Conflicts:
CMakeLists.txt
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
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 |