[Liblas-commits] hg: 2 new changesets

[liblas-commits at liblas.org]

changeset 5cb98c7f09ad in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=5cb98c7f09ad
summary: Disable copying operatoins in WriterImpl

changeset b1244e1f9b8b in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=b1244e1f9b8b
summary: Fixed linker problems reported by Visual C++ about undefined geotiff/libtiff symbols. Updated CMake configuration for Visual Studio builds. Added libtiff check. NOTE: There may be mysterious issue with GDAL definitions using deprecated stricmp and strnicmp instead of underscored versions. Visual C++ 10.0 throws linker errors like: las.lib(gt_citation.obj) : error LNK2001: unresolved external symbol __imp__stricmp. If it happens, prefix the two functions with underscore in cpl_port.h where EQUAL and EQUALN macros are defined.

diffstat:

 CMakeLists.txt                          |  8 ++++++++
 apps/CMakeLists.txt                     |  3 ++-
 include/liblas/detail/writer/writer.hpp |  4 ++++
 src/CMakeLists.txt                      |  1 +
 test/unit/CMakeLists.txt                |  7 +++++--
 5 files changed, 20 insertions(+), 3 deletions(-)

diffs (79 lines):

diff -r 29752c85f368 -r b1244e1f9b8b CMakeLists.txt
--- a/CMakeLists.txt	Thu Mar 11 11:06:18 2010 -0600
+++ b/CMakeLists.txt	Tue Mar 16 00:29:51 2010 +0000
@@ -150,6 +150,14 @@
             add_definitions(-DHAVE_LIBGEOTIFF=1)
         endif()
     endif()
+
+    # Determine libTIFF availability, required
+    if (GEOTIFF_FOUND)
+        find_package(TIFF)
+        if (TIFF_FOUND)
+            include_directories(${TIFF_INCLUDE_DIR})
+        endif()
+    endif()
 endif()
 
 # GDAL/OGR support - optional, default=OFF
diff -r 29752c85f368 -r b1244e1f9b8b apps/CMakeLists.txt
--- a/apps/CMakeLists.txt	Thu Mar 11 11:06:18 2010 -0600
+++ b/apps/CMakeLists.txt	Tue Mar 16 00:29:51 2010 +0000
@@ -47,7 +47,7 @@
         set(USER_FILE ${utility}.vcproj.$ENV{USERDOMAIN}.$ENV{USERNAME}.user)
         set(OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/${USER_FILE})
         message(STATUS "Generating ${CMAKE_GENERATOR} user-specific settings in ${USER_FILE}")
-        configure_file(${CMAKE_SOURCE_DIR}/build/cmake/libLAS.vcproj.user.template ${OUTPUT_PATH} @ONLY)
+        configure_file(${CMAKE_SOURCE_DIR}/cmake/libLAS.vcproj.user.template ${OUTPUT_PATH} @ONLY)
     endforeach()
 endif()
 
@@ -57,6 +57,7 @@
 set(APPS_CPP_DEPENDENCIES
     ${LIBLAS_LIB_NAME}
     ${ZLIB_LIBRARY}
+    ${TIFF_LIBRARY}
     ${GEOTIFF_LIBRARY}
     ${GDAL_LIBRARY}
     ${SPATIALINDEX_LIBRARY}
diff -r 29752c85f368 -r b1244e1f9b8b include/liblas/detail/writer/writer.hpp
--- a/include/liblas/detail/writer/writer.hpp	Thu Mar 11 11:06:18 2010 -0600
+++ b/include/liblas/detail/writer/writer.hpp	Tue Mar 16 00:29:51 2010 +0000
@@ -85,6 +85,10 @@
 
     void CreateTransform();
     liblas::uint32_t m_pointCount;
+
+    // block copying operations
+    WriterImpl(WriterImpl const& other);
+    WriterImpl& operator=(WriterImpl const& other);
 };
 
 class WriterFactory
diff -r 29752c85f368 -r b1244e1f9b8b src/CMakeLists.txt
--- a/src/CMakeLists.txt	Thu Mar 11 11:06:18 2010 -0600
+++ b/src/CMakeLists.txt	Tue Mar 16 00:29:51 2010 +0000
@@ -134,6 +134,7 @@
 target_link_libraries(${LIBLAS_C_LIB_NAME}
   ${LIBLAS_LIB_NAME}
   ${ZLIB_LIBRARIES}
+  ${TIFF_LIBRARY}
   ${GEOTIFF_LIBRARY}
   ${GDAL_LIBRARY}
   ${SPATIALINDEX_LIBRARY})
diff -r 29752c85f368 -r b1244e1f9b8b test/unit/CMakeLists.txt
--- a/test/unit/CMakeLists.txt	Thu Mar 11 11:06:18 2010 -0600
+++ b/test/unit/CMakeLists.txt	Tue Mar 16 00:29:51 2010 +0000
@@ -30,7 +30,10 @@
 
 TARGET_LINK_LIBRARIES(${LIBLAS_UNIT_TEST} 
     ${LIBLAS_LIB_NAME}
-	${GDAL_LIBRARY}
-	${GEOTIFF_LIBRARY})
+    ${ZLIB_LIBRARIES}
+    ${TIFF_LIBRARY}
+    ${GEOTIFF_LIBRARY}
+    ${GDAL_LIBRARY}
+    ${SPATIALINDEX_LIBRARY})
 
 ADD_TEST(liblas_test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/liblas_test ${CMAKE_SOURCE_DIR}/test/data)