Created
February 8, 2014 21:34
-
-
Save dakcarto/8890690 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/CMake/FindLibLAS.cmake b/CMake/FindLibLAS.cmake | |
index 4a1ba35..4b7fdc7 100644 | |
--- a/CMake/FindLibLAS.cmake | |
+++ b/CMake/FindLibLAS.cmake | |
@@ -14,7 +14,7 @@ ENDIF( LIBLAS_INCLUDE_DIR ) | |
FIND_PATH( LIBLAS_INCLUDE_DIR liblas/capi/liblas.h ) | |
FIND_LIBRARY( LIBLAS_LIBRARY | |
- NAMES liblas_c liblas ) | |
+ NAMES liblas_c liblas las_c las ) | |
# handle the QUIETLY and REQUIRED arguments and set LIBLAS_FOUND to TRUE if | |
# all listed variables are TRUE | |
diff --git a/CMake/ImportOpenThreads.cmake b/CMake/ImportOpenThreads.cmake | |
index 56c64b6..1aa4e75 100644 | |
--- a/CMake/ImportOpenThreads.cmake | |
+++ b/CMake/ImportOpenThreads.cmake | |
@@ -7,7 +7,7 @@ MARK_AS_ADVANCED(OPENTHREADS_LIBRARY) | |
MARK_AS_ADVANCED(OPENTHREADS_LIBRARY_DEBUG) | |
SET(OTB_USE_EXTERNAL_OPENTHREADS ON CACHE INTERNAL "") | |
-IF(OPENTHREADS_FOUND) | |
+IF(OPENTHREADS_FOUND AND OTB_USE_EXTERNAL_OPENTHREADS) | |
INCLUDE_DIRECTORIES(${OPENTHREADS_INCLUDE_DIR}) | |
LINK_DIRECTORIES( ${OPENTHREADS_LIBRARY} ) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment