[Liblas-commits] hg-main-tree: refer to CacheFilter in its namespace

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/149d7d4db85e
changeset: 271:149d7d4db85e
user:      Kirk McKelvey <kirkoman at gmail.com>
date:      Wed Mar 16 09:47:48 2011 -0500
description:
refer to CacheFilter in its namespace
Subject: hg-main-tree: merge

details:   http://hg.libpc.orghg-main-tree/rev/cc916926be5b
changeset: 272:cc916926be5b
user:      Kirk McKelvey <kirkoman at gmail.com>
date:      Wed Mar 16 09:50:00 2011 -0500
description:
merge

diffstat:

 apps/pc2pc.cpp           |  2 +-
 test/unit/CMakeLists.txt |  6 ++++++
 2 files changed, 7 insertions(+), 1 deletions(-)

diffs (28 lines):

diff -r 1d218d135e1d -r cc916926be5b apps/pc2pc.cpp
--- a/apps/pc2pc.cpp	Wed Mar 16 09:42:59 2011 -0500
+++ b/apps/pc2pc.cpp	Wed Mar 16 09:50:00 2011 -0500
@@ -139,7 +139,7 @@
         tree.put("debug", true);
         tree.put("verbose", true);
         
-        CacheFilter cache(reader, 1, 1024);
+        libpc::filters::CacheFilter cache(reader, 1, 1024);
         
         libpc::driver::oci::Writer writer(cache, options);
         
diff -r 1d218d135e1d -r cc916926be5b test/unit/CMakeLists.txt
--- a/test/unit/CMakeLists.txt	Wed Mar 16 09:42:59 2011 -0500
+++ b/test/unit/CMakeLists.txt	Wed Mar 16 09:50:00 2011 -0500
@@ -49,6 +49,12 @@
   if (MSVC)
     add_definitions("-DBOOST_TEST_DYN_LINK")
   endif()
+else()
+    if(Boost_PROGRAM_OPTIONS_LIBRARY MATCHES "\\.a$")
+        # pass, we can compile static
+    else()
+        add_definitions("-DBOOST_TEST_DYN_LINK")
+    endif()
 endif()
 
 TARGET_LINK_LIBRARIES(${LIBPC_UNIT_TEST}