allow library names liblas.lib and liblas_c.lib;fix include dirs typo; link only liblas_c in plugin.

remotes/origin/Deprecated_master_20th_November_2022
Laurens Voerman 8 years ago
parent ad0e6a0f81
commit ef01913b9a

@ -17,7 +17,7 @@ macro(FIND_LIBLAS_LIBRARY MYLIBRARY MYLIBRARYNAME)
find_library( find_library(
"${MYLIBRARY}_DEBUG" "${MYLIBRARY}_DEBUG"
NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}" NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}" "lib${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
PATHS PATHS
${LIBLAS_DIR}/lib/Debug ${LIBLAS_DIR}/lib/Debug
${LIBLAS_DIR}/lib64/Debug ${LIBLAS_DIR}/lib64/Debug
@ -30,7 +30,7 @@ macro(FIND_LIBLAS_LIBRARY MYLIBRARY MYLIBRARYNAME)
find_library( find_library(
"${MYLIBRARY}_DEBUG" "${MYLIBRARY}_DEBUG"
NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}" NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}" "lib${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks
@ -48,7 +48,7 @@ macro(FIND_LIBLAS_LIBRARY MYLIBRARY MYLIBRARYNAME)
find_library( find_library(
${MYLIBRARY} ${MYLIBRARY}
NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}" NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}" "lib${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}"
PATHS PATHS
${LIBLAS_DIR}/lib/Release ${LIBLAS_DIR}/lib/Release
${LIBLAS_DIR}/lib64/Release ${LIBLAS_DIR}/lib64/Release
@ -69,7 +69,7 @@ macro(FIND_LIBLAS_LIBRARY MYLIBRARY MYLIBRARYNAME)
find_library( find_library(
${MYLIBRARY} ${MYLIBRARY}
NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}" NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}" "lib${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}"
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks

@ -1,9 +1,9 @@
INCLUDE_DIRECTORIES(${LIBLAS_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${LIBLAS_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
SET(TARGET_SRC ReaderWriterLAS.cpp ) SET(TARGET_SRC ReaderWriterLAS.cpp )
SET(TARGET_LIBRARIES_VARS LIBLAS_LIBRARIES) SET(TARGET_LIBRARIES_VARS LIBLAS_LIBRARY LIBLASC_LIBRARY)
#### end var setup ### #### end var setup ###
SETUP_PLUGIN(las) SETUP_PLUGIN(las)

Loading…
Cancel
Save