[Liblas-commits] r1191 - in trunk: . build/cmake src

[liblas-commits at liblas.org]

Author: mloskot
Date: Thu Apr  9 09:59:48 2009
New Revision: 1191
URL: http://liblas.org/changeset/1191

Log:
Updated CMake build configuration - work in progress.

Modified:
   trunk/CMakeLists.txt
   trunk/build/cmake/FindGeoTIFF.cmake
   trunk/src/CMakeLists.txt

Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt	(original)
+++ trunk/CMakeLists.txt	Thu Apr  9 09:59:48 2009
@@ -18,7 +18,7 @@
 
 SET( CMAKE_COLOR_MAKEFILE ON )
 
-# set path to additional CMake modules
+# Path to additional CMake modules
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/build/cmake ${CMAKE_MODULE_PATH})
 
 
@@ -31,9 +31,6 @@
       FORCE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
-# Enable CTest to run libLas Unit Test Suite
-#ENABLE_TESTING()
-
 #############################################################
 # Platform and compiler specific settings
 
@@ -47,6 +44,7 @@
             ADD_DEFINITIONS( /D_CRT_NONSTDC_NO_WARNING )
         ENDIF (MSVC80)
     ENDIF (MSVC)
+
 ELSE (WIN32)
 
     IF (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
@@ -63,16 +61,15 @@
 #############################################################
 # Search for dependencies
 
-# optinal GeoTIFF support
+# GeoTIFF support (optional)
 FIND_PACKAGE(GeoTIFF)
-
 IF (GEOTIFF_FOUND)
 	#TODO: Use to generate config.h
 	#SET (HAVE_LIBGEOTIFF TRUE)
 	ADD_DEFINITIONS( -D HAVE_LIBGEOTIFF )
 ENDIF (GEOTIFF_FOUND)
 
-# optinal GeoTIFF support
+# GDAL support (optional)
 FIND_PACKAGE(GDAL)
 
 IF (GDAL_FOUND)
@@ -93,9 +90,7 @@
 
 
 
-
-
-
+IF (XXX_FOUND)
 
 ########## THE HUGE BLOCK BELOW IS TO LEARN CMAKE AND WILL BE REMOVED ###############
 # ------------------------- Begin Generic CMake Variable Logging ------------------
@@ -247,3 +242,4 @@
 
 MESSAGE( STATUS "=============== END TEST VARIABLES LOGGING OUTPUT ===============" )
 # ------------------------- End of Generic CMake Variable Logging ------------------
+ENDIF (XXX_FOUND)

Modified: trunk/build/cmake/FindGeoTIFF.cmake
==============================================================================
--- trunk/build/cmake/FindGeoTIFF.cmake	(original)
+++ trunk/build/cmake/FindGeoTIFF.cmake	Thu Apr  9 09:59:48 2009
@@ -15,36 +15,39 @@
 FIND_PATH(GEOTIFF_INCLUDE_DIR geotiff.h
   "$ENV{LIB_DIR}/include"
   "$ENV{LIB_DIR}/include/geotiff"
-  #mingw
+  # MinGW
   c:/msys/local/include
   NO_DEFAULT_PATH
-  )
+)
+
 FIND_PATH(GEOTIFF_INCLUDE_DIR geotiff.h)
 
 SET(GEOTIFF_NAMES ${GEOTIFF_NAMES} geotiff geotiff_i)
 
 FIND_LIBRARY(GEOTIFF_LIBRARY NAMES ${GEOTIFF_NAMES} PATHS
   "$ENV{LIB_DIR}/lib"
-  #mingw
+  # MinGW
   c:/msys/local/lib
   NO_DEFAULT_PATH
-  )
+)
+
 FIND_LIBRARY(GEOTIFF_LIBRARY NAMES ${GEOTIFF_NAMES})
 
 IF (GEOTIFF_INCLUDE_DIR AND GEOTIFF_LIBRARY)
-   SET(GEOTIFF_FOUND TRUE)
+    SET(GEOTIFF_FOUND TRUE)
 ENDIF (GEOTIFF_INCLUDE_DIR AND GEOTIFF_LIBRARY)
 
 IF (GEOTIFF_FOUND)
 
-   IF (NOT GEOTIFF_FIND_QUIETLY)
-      MESSAGE(STATUS "Found GeoTIFF: ${GEOTIFF_LIBRARY}")
-   ENDIF (NOT GEOTIFF_FIND_QUIETLY)
+    IF (NOT GEOTIFF_FIND_QUIETLY)
+        MESSAGE(STATUS "Found GeoTIFF: ${GEOTIFF_LIBRARY}")
+    ENDIF (NOT GEOTIFF_FIND_QUIETLY)
 
 ELSE (GEOTIFF_FOUND)
 
-   IF (GEOTIFF_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find GeoTIFF library")
-   ENDIF (GEOTIFF_FIND_REQUIRED)
+    MESSAGE(STATUS "GeoTIFF library not found")
+    IF (GEOTIFF_FIND_REQUIRED)
+        MESSAGE(FATAL_ERROR "GeoTIFF library is required")
+    ENDIF (GEOTIFF_FIND_REQUIRED)
 
 ENDIF (GEOTIFF_FOUND)

Modified: trunk/src/CMakeLists.txt
==============================================================================
--- trunk/src/CMakeLists.txt	(original)
+++ trunk/src/CMakeLists.txt	Thu Apr  9 09:59:48 2009
@@ -7,18 +7,19 @@
 
 SET( LIBLAS_HPP
     ../include/liblas/cstdint.hpp
+    ../include/liblas/exception.hpp
     ../include/liblas/guid.hpp
     ../include/liblas/iterator.hpp
+    ../include/liblas/lascolor.hpp
     ../include/liblas/laserror.hpp
     ../include/liblas/lasfile.hpp
     ../include/liblas/lasheader.hpp
     ../include/liblas/laspoint.hpp
-    ../include/liblas/lasvariablerecord.hpp
     ../include/liblas/lasreader.hpp
+	../include/liblas/lasspatialreference.hpp
     ../include/liblas/lasvariablerecord.hpp
     ../include/liblas/laswriter.hpp
     ../include/liblas/liblas.hpp
-	../include/liblas/lasspatialreference.hpp
 )
 
 SET( LIBLAS_DETAIL_HPP
@@ -40,17 +41,20 @@
 )
 
 SET( LIBLAS_CPP
+    lascolor.cpp
     laserror.cpp
-    laspoint.cpp
+    lasfile.cpp
     lasheader.cpp
-    lasrecordheader.cpp
+    laspoint.cpp
     lasreader.cpp
+    lasspatialreference.cpp
+    lasvariablerecord.cpp
     laswriter.cpp
-    lasfile.cpp
-	lasspatialreference.cpp
 )
+# TODO: add IF GDAL_FOUND += gt_wkt_srs.cp
 
 SET( LIBLAS_DETAIL_CPP
+    detail/file.cpp
     detail/reader.cpp
     detail/reader10.cpp
     detail/reader11.cpp
@@ -59,7 +63,6 @@
     detail/writer10.cpp
     detail/writer11.cpp
 	detail/writer12.cpp
-    detail/file.cpp
 )
 
 SET( LIBLAS_SOURCES