[Liblas-commits] hg: Fixed EOL to LF in CMake macros.
liblas-commits at liblas.org
liblas-commits at liblas.org
Wed Dec 30 21:12:31 EST 2009
changeset 3e2aa2eb7cb4 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=3e2aa2eb7cb4
summary: Fixed EOL to LF in CMake macros.
diffstat:
build/cmake/FindGeoTIFF.cmake | 118 ++++++++++++++++++------------------
build/cmake/FindSpatialIndex.cmake | 18 ++--
2 files changed, 68 insertions(+), 68 deletions(-)
diffs (156 lines):
diff -r 18b2578d36fd -r 3e2aa2eb7cb4 build/cmake/FindGeoTIFF.cmake
--- a/build/cmake/FindGeoTIFF.cmake Thu Dec 31 02:03:32 2009 +0000
+++ b/build/cmake/FindGeoTIFF.cmake Thu Dec 31 02:12:19 2009 +0000
@@ -1,59 +1,59 @@
-###############################################################################
-#
-# CMake module to search for GeoTIFF library
-#
-# On success, the macro sets the following variables:
-# GEOTIFF_FOUND = if the library found
-# GEOTIFF_LIBRARIES = full path to the library
-# GEOTIFF_INCLUDE_DIR = where to find the library headers
-# also defined, but not for general use are
-# GEOTIFF_LIBRARY, where to find the PROJ.4 library.
-#
-# Copyright (c) 2009 Mateusz Loskot <mateusz at loskot.net>
-#
-# Module source: http://github.com/mloskot/workshop/tree/master/cmake/
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-###############################################################################
-MESSAGE(STATUS "Searching for GeoTIFF ${GeoTIFF_FIND_VERSION}+ library")
-MESSAGE(STATUS " NOTE: Required version is not checked - to be implemented")
-
-IF(GEOTIFF_INCLUDE_DIR)
- # Already in cache, be silent
- SET(GEOTIFF_FIND_QUIETLY TRUE)
-ENDIF()
-
-IF(WIN32)
- SET(OSGEO4W_IMPORT_LIBRARY geotiff_i)
- IF(DEFINED ENV{OSGEO4W_ROOT})
- SET(OSGEO4W_ROOT_DIR $ENV{OSGEO4W_ROOT})
- MESSAGE(STATUS "Trying OSGeo4W using environment variable OSGEO4W_ROOT=$ENV{OSGEO4W_ROOT}")
- ELSE()
- SET(OSGEO4W_ROOT_DIR c:/OSGeo4W)
- MESSAGE(STATUS "Trying OSGeo4W using default location OSGEO4W_ROOT=${OSGEO4W_ROOT_DIR}")
- ENDIF()
-ENDIF()
-
-FIND_PATH(GEOTIFF_INCLUDE_DIR
- geotiff.h
- PATH_PREFIXES geotiff
- PATHS
- ${OSGEO4W_ROOT_DIR}/include)
-
-SET(GEOTIFF_NAMES ${OSGEO4W_IMPORT_LIBRARY} geotiff)
-
-FIND_LIBRARY(GEOTIFF_LIBRARY
- NAMES ${GEOTIFF_NAMES}
- PATHS
- ${OSGEO4W_ROOT_DIR}/lib)
-
-IF(GEOTIFF_FOUND)
- SET(GEOTIFF_LIBRARIES ${GEOTIFF_LIBRARY})
-ENDIF()
-
-# Handle the QUIETLY and REQUIRED arguments and set GEOTIFF_FOUND to TRUE
-# if all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GEOTIFF DEFAULT_MSG GEOTIFF_LIBRARY GEOTIFF_INCLUDE_DIR)
+###############################################################################
+#
+# CMake module to search for GeoTIFF library
+#
+# On success, the macro sets the following variables:
+# GEOTIFF_FOUND = if the library found
+# GEOTIFF_LIBRARIES = full path to the library
+# GEOTIFF_INCLUDE_DIR = where to find the library headers
+# also defined, but not for general use are
+# GEOTIFF_LIBRARY, where to find the PROJ.4 library.
+#
+# Copyright (c) 2009 Mateusz Loskot <mateusz at loskot.net>
+#
+# Module source: http://github.com/mloskot/workshop/tree/master/cmake/
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+###############################################################################
+MESSAGE(STATUS "Searching for GeoTIFF ${GeoTIFF_FIND_VERSION}+ library")
+MESSAGE(STATUS " NOTE: Required version is not checked - to be implemented")
+
+IF(GEOTIFF_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(GEOTIFF_FIND_QUIETLY TRUE)
+ENDIF()
+
+IF(WIN32)
+ SET(OSGEO4W_IMPORT_LIBRARY geotiff_i)
+ IF(DEFINED ENV{OSGEO4W_ROOT})
+ SET(OSGEO4W_ROOT_DIR $ENV{OSGEO4W_ROOT})
+ MESSAGE(STATUS "Trying OSGeo4W using environment variable OSGEO4W_ROOT=$ENV{OSGEO4W_ROOT}")
+ ELSE()
+ SET(OSGEO4W_ROOT_DIR c:/OSGeo4W)
+ MESSAGE(STATUS "Trying OSGeo4W using default location OSGEO4W_ROOT=${OSGEO4W_ROOT_DIR}")
+ ENDIF()
+ENDIF()
+
+FIND_PATH(GEOTIFF_INCLUDE_DIR
+ geotiff.h
+ PATH_PREFIXES geotiff
+ PATHS
+ ${OSGEO4W_ROOT_DIR}/include)
+
+SET(GEOTIFF_NAMES ${OSGEO4W_IMPORT_LIBRARY} geotiff)
+
+FIND_LIBRARY(GEOTIFF_LIBRARY
+ NAMES ${GEOTIFF_NAMES}
+ PATHS
+ ${OSGEO4W_ROOT_DIR}/lib)
+
+IF(GEOTIFF_FOUND)
+ SET(GEOTIFF_LIBRARIES ${GEOTIFF_LIBRARY})
+ENDIF()
+
+# Handle the QUIETLY and REQUIRED arguments and set GEOTIFF_FOUND to TRUE
+# if all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GEOTIFF DEFAULT_MSG GEOTIFF_LIBRARY GEOTIFF_INCLUDE_DIR)
diff -r 18b2578d36fd -r 3e2aa2eb7cb4 build/cmake/FindSpatialIndex.cmake
--- a/build/cmake/FindSpatialIndex.cmake Thu Dec 31 02:03:32 2009 +0000
+++ b/build/cmake/FindSpatialIndex.cmake Thu Dec 31 02:12:19 2009 +0000
@@ -56,21 +56,21 @@
STRING(REGEX REPLACE ".*#define[ \t]SIDX_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1" SIDX_VERSION_MAJOR "${SPATIALINDEX_VERSION_H_CONTENTS}")
STRING(REGEX REPLACE ".*#define[ \t]SIDX_VERSION_MINOR[ \t]+([0-9]+).*" "\\1" SIDX_VERSION_MINOR "${SPATIALINDEX_VERSION_H_CONTENTS}")
STRING(REGEX REPLACE ".*#define[ \t]SIDX_VERSION_REV[ \t]+([0-9]+).*" "\\1" SIDX_VERSION_REV "${SPATIALINDEX_VERSION_H_CONTENTS}")
-
- IF(NOT ${SIDX_VERSION_MAJOR} MATCHES "[0-9]+")
- MESSAGE(FATAL_ERROR "SpatialIndex version parsing failed for SIDX_VERSION_MAJOR!")
- ENDIF()
- IF(NOT ${SIDX_VERSION_MINOR} MATCHES "[0-9]+")
- MESSAGE(FATAL_ERROR "SpatialIndex version parsing failed for SIDX_VERSION_MINOR!")
+
+ IF(NOT ${SIDX_VERSION_MAJOR} MATCHES "[0-9]+")
+ MESSAGE(FATAL_ERROR "SpatialIndex version parsing failed for SIDX_VERSION_MAJOR!")
ENDIF()
- IF(NOT ${SIDX_VERSION_REV} MATCHES "[0-9]+")
- MESSAGE(FATAL_ERROR "SpatialIndex version parsing failed for SIDX_VERSION_REV!")
+ IF(NOT ${SIDX_VERSION_MINOR} MATCHES "[0-9]+")
+ MESSAGE(FATAL_ERROR "SpatialIndex version parsing failed for SIDX_VERSION_MINOR!")
+ ENDIF()
+ IF(NOT ${SIDX_VERSION_REV} MATCHES "[0-9]+")
+ MESSAGE(FATAL_ERROR "SpatialIndex version parsing failed for SIDX_VERSION_REV!")
ENDIF()
SET(SPATIALINDEX_VERSION "${SIDX_VERSION_MAJOR}.${SIDX_VERSION_MINOR}.${SIDX_VERSION_REV}"
CACHE INTERNAL "The version string for SpatialIndex library")
- IF (SPATIALINDEX_VERSION VERSION_EQUAL SpatialIndex_FIND_VERSION OR
+ IF (SPATIALINDEX_VERSION VERSION_EQUAL SpatialIndex_FIND_VERSION OR
SPATIALINDEX_VERSION VERSION_GREATER SpatialIndex_FIND_VERSION)
MESSAGE(STATUS "Found SpatialIndex version: ${SPATIALINDEX_VERSION}")
ELSE()
More information about the Liblas-commits
mailing list