[Liblas-commits] hg: remove lint

[liblas-commits at liblas.org]

details:   http://hg.liblas.orghg/rev/af352308edc5
changeset: 2675:af352308edc5
user:      Howard Butler <hobu.inc at gmail.com>
date:      Tue Jan 04 11:42:05 2011 -0600
description:
remove lint
Subject: hg: tweak path finding for LASzip

details:   http://hg.liblas.orghg/rev/a910326211e1
changeset: 2676:a910326211e1
user:      Howard Butler <hobu.inc at gmail.com>
date:      Tue Jan 04 11:51:17 2011 -0600
description:
tweak path finding for LASzip
Subject: hg: turn off fPIC.  I hate you fPIC

details:   http://hg.liblas.orghg/rev/9cd627290904
changeset: 2677:9cd627290904
user:      Howard Butler <hobu.inc at gmail.com>
date:      Tue Jan 04 12:01:12 2011 -0600
description:
turn off fPIC.  I hate you fPIC

diffstat:

 CMakeLists.txt                   |   2 +-
 cmake/modules/BuildOSGeo4W.cmake |   2 --
 cmake/modules/FindLASzip.cmake   |  11 +++++++++--
 src/CMakeLists.txt               |   6 +++---
 4 files changed, 13 insertions(+), 8 deletions(-)

diffs (80 lines):

diff -r b8ede5465c2b -r 9cd627290904 CMakeLists.txt
--- a/CMakeLists.txt	Tue Jan 04 08:05:32 2011 -0800
+++ b/CMakeLists.txt	Tue Jan 04 12:01:12 2011 -0600
@@ -141,7 +141,7 @@
 
   if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
 
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ${LIBLAS_COMMON_CXX_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBLAS_COMMON_CXX_FLAGS}")
     if (CMAKE_COMPILER_IS_GNUCXX)
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
     endif()
diff -r b8ede5465c2b -r 9cd627290904 cmake/modules/BuildOSGeo4W.cmake
--- a/cmake/modules/BuildOSGeo4W.cmake	Tue Jan 04 08:05:32 2011 -0800
+++ b/cmake/modules/BuildOSGeo4W.cmake	Tue Jan 04 12:01:12 2011 -0600
@@ -44,9 +44,7 @@
   COMMAND ${CMAKE_COMMAND} -E echo "Building OSGeo4W install directories")
 
 foreach(utility ${LIBLAS_UTILITIES})
-    MESSAGE("Adding dependency for $utility")
     add_dependencies(  make_osgeo4w_directories  ${utility} )
-
 endforeach()
 
 
diff -r b8ede5465c2b -r 9cd627290904 cmake/modules/FindLASzip.cmake
--- a/cmake/modules/FindLASzip.cmake	Tue Jan 04 08:05:32 2011 -0800
+++ b/cmake/modules/FindLASzip.cmake	Tue Jan 04 12:01:12 2011 -0600
@@ -26,7 +26,7 @@
 ENDIF()
 
 IF(WIN32)
-  SET(OSGEO4W_IMPORT_LIBRARY laszip_i)
+  SET(OSGEO4W_IMPORT_LIBRARY laszip)
   IF(DEFINED ENV{OSGEO4W_ROOT})
     SET(OSGEO4W_ROOT_DIR $ENV{OSGEO4W_ROOT})
     MESSAGE(STATUS "Trying OSGeo4W using environment variable OSGEO4W_ROOT=$ENV{OSGEO4W_ROOT}")
@@ -35,11 +35,15 @@
     MESSAGE(STATUS "Trying OSGeo4W using default location OSGEO4W_ROOT=${OSGEO4W_ROOT_DIR}")
   ENDIF()
 ENDIF()
-     
+
+
 FIND_PATH(LASZIP_INCLUDE_DIR
   laszip.hpp
   PATH_PREFIXES laszip
   PATHS
+  /usr/include
+  /usr/local/include
+  /tmp/lasjunk/include
   ${OSGEO4W_ROOT_DIR}/include)
 
 SET(LASZIP_NAMES ${OSGEO4W_IMPORT_LIBRARY} laszip)
@@ -47,6 +51,9 @@
 FIND_LIBRARY(LASZIP_LIBRARY
   NAMES ${LASZIP_NAMES}
   PATHS
+  /usr/lib
+  /usr/local/lib
+  /tmp/lasjunk/lib
   ${OSGEO4W_ROOT_DIR}/lib)
 
 IF(LASZIP_FOUND)
diff -r b8ede5465c2b -r 9cd627290904 src/CMakeLists.txt
--- a/src/CMakeLists.txt	Tue Jan 04 08:05:32 2011 -0800
+++ b/src/CMakeLists.txt	Tue Jan 04 12:01:12 2011 -0600
@@ -208,9 +208,9 @@
 # This hack is required to correctly link static into shared library.
 # Such practice is not recommended as not portable, instead each library,
 # static and shared should be built from sources separately.
-if(UNIX)
-  add_definitions("-fPIC")
-endif()
+#if(UNIX)
+#  add_definitions("-fPIC")
+#endif()
 
 if(WIN32)
     add_definitions("-DLAS_DLL_EXPORT=1")