Permalink
Browse files

remove old LAStools utilities that don't belong in liblas #39

  • Loading branch information...
hobu committed Jun 6, 2014
1 parent b8799e5 commit 834f1ab517d6e93233fe10391a78ae390ceb200b
Showing with 4 additions and 2,128 deletions.
  1. +2 −2 CMakeLists.txt
  2. +2 −34 apps/CMakeLists.txt
  3. +0 −1,165 apps/las2las-old.c
  4. +0 −420 apps/lasinfo-old.c
  5. +0 −507 apps/lasmerge.c
View
@@ -144,13 +144,13 @@ else()
# enum) 2012-09-05. Remove -Wcast-qual -Wfloat-equal
# -Wredundant-decls to suppress the multitude of warning messages.
set(LIBLAS_COMMON_CXX_FLAGS
"-ansi -Wall -Wpointer-arith -Wcast-align -Wno-long-long")
" -Wall -Wpointer-arith -Wcast-align -Wno-long-long")
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
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")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -ansi")
endif()
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang")
View
@@ -14,12 +14,8 @@ include_directories(
###############################################################################
# Collect programs to build
set(LASINFO_OLD lasinfo-old)
set(LASINFO lasinfo)
set(LASMERGE lasmerge)
set(LAS2LAS las2las)
set(LAS2LAS_OLD las2las-old)
set(LAS2TXT_OLD las2txt-old)
set(LAS2TXT las2txt)
set(TXT2LAS txt2las)
set(TS2LAS ts2las)
@@ -45,8 +41,8 @@ endif()
set(LIBLAS_UTILITIES
${LASINFO_OLD} ${LASINFO} ${LASMERGE} ${LAS2LAS} ${LAS2TXT_OLD} ${TXT2LAS}
${LAS2OGR} ${LAS2LAS} ${LAS2LAS_OLD} ${LASBLOCK} ${TS2LAS} ${LAS2TXT} )
${LASINFO} ${LAS2LAS} ${TXT2LAS}
${LAS2OGR} ${LAS2LAS} ${LASBLOCK} ${TS2LAS} ${LAS2TXT} )
# TODO: Experimental and requires testing --mloskot
# Generate user-specific settings for Visual Studio project
@@ -84,20 +80,6 @@ link_directories(${Boost_LIBRARY_DIRS})
# add_executable(lasschematest lasschematest.cpp laskernel.cpp)
# target_link_libraries(lasschematest ${APPS_CPP_DEPENDENCIES} ${LIBXML2_LIBRARIES})
# Build lasinfo
if(LASINFO_OLD)
set(LASINFO_OLD_SRC lascommon.c ${LASINFO_OLD}.c)
add_executable(${LASINFO_OLD} ${LASINFO_OLD_SRC})
target_link_libraries(${LASINFO_OLD} ${LIBLAS_C_LIB_NAME})
endif()
# Build las2las
if(LAS2LAS_OLD)
set(LAS2LAS_OLD_SRC lascommon.c ${LAS2LAS_OLD}.c)
add_executable(${LAS2LAS_OLD} ${LAS2LAS_OLD_SRC})
target_link_libraries(${LAS2LAS_OLD} ${LIBLAS_C_LIB_NAME})
endif()
if(LAS2LAS)
add_executable(${LAS2LAS} las2las.cpp laskernel.cpp)
@@ -109,13 +91,6 @@ if(LASINFO)
target_link_libraries(${LASINFO} ${APPS_CPP_DEPENDENCIES} )
endif()
# Build las2txt
if(LAS2TXT_OLD)
set(LAS2TXT_OLD_SRC lascommon.c ${LAS2TXT}.c)
add_executable(${LAS2TXT_OLD} ${LAS2TXT_OLD_SRC})
target_link_libraries(${LAS2TXT_OLD} ${LIBLAS_C_LIB_NAME})
endif()
if(LAS2TXT)
add_executable( ${LAS2TXT} las2txt.cpp laskernel.cpp )
target_link_libraries(${LAS2TXT} ${APPS_CPP_DEPENDENCIES} )
@@ -133,13 +108,6 @@ if(TS2LAS)
target_link_libraries(${TS2LAS} ${APPS_CPP_DEPENDENCIES} )
endif()
# Build lasmerge
if(LASMERGE)
set(LASMERGE_SRC lascommon.c ${LASMERGE}.c)
add_executable(${LASMERGE} ${LASMERGE_SRC})
target_link_libraries(${LASMERGE} ${LIBLAS_C_LIB_NAME})
endif()
# Build lasblock
if(LASBLOCK)
set(LASBLOCK_SRC lasblock.cpp laskernel.cpp)
Oops, something went wrong.

0 comments on commit 834f1ab

Please sign in to comment.