generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More accurate cmake flags sets/unsets for 3rdparty libs

Browse Source
This commit is contained in:
Andrey Kamaev 2012-03-02 11:36:34 +00:00
parent 06a6c5851c
commit ab221fb3d6
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmake/OpenCVIOLibs.cmake
View File

@ -1,6 +1,12 @@
macro(unset_all)
foreach(var ${ARGN})
unset(${var} CACHE)
endforeach()
endmacro()
################### zlib - required ################### zlib - required
if(BUILD_ZLIB) if(BUILD_ZLIB)
set(ZLIB_FOUND FALSE) unset_all(ZLIB_FOUND)
else() else()
if(ANDROID) if(ANDROID)
set(ZLIB_FOUND TRUE) set(ZLIB_FOUND TRUE)
@ -13,6 +19,8 @@ else()
endif() endif()
if(NOT ZLIB_FOUND) if(NOT ZLIB_FOUND)
unset_all(ZLIB_LIBRARY ZLIB_LIBRARIES ZLIB_INCLUDE_DIR)
set(ZLIB_LIBRARY zlib) set(ZLIB_LIBRARY zlib)
set(ZLIB_LIBRARIES ${ZLIB_LIBRARY}) set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/zlib") add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/zlib")
@ -22,13 +30,15 @@ endif()
################### libtiff - optional (should be searched after zlib) ################### libtiff - optional (should be searched after zlib)
if(WITH_TIFF) if(WITH_TIFF)
if(BUILD_TIFF) if(BUILD_TIFF)
set(TIFF_FOUND FALSE) unset_all(TIFF_FOUND)
else() else()
include(FindTIFF) include(FindTIFF)
endif() endif()
endif() endif()
if(WITH_TIFF AND NOT TIFF_FOUND) if(WITH_TIFF AND NOT TIFF_FOUND)
unset_all(TIFF_LIBRARY TIFF_LIBRARIES TIFF_INCLUDE_DIR)
set(TIFF_LIBRARY libtiff) set(TIFF_LIBRARY libtiff)
set(TIFF_LIBRARIES ${TIFF_LIBRARY}) set(TIFF_LIBRARIES ${TIFF_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libtiff") add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libtiff")
@ -38,13 +48,15 @@ endif()
################### libjpeg - optional ################### libjpeg - optional
if(WITH_JPEG) if(WITH_JPEG)
if(BUILD_JPEG) if(BUILD_JPEG)
set(JPEG_FOUND FALSE) unset_all(JPEG_FOUND)
else() else()
include(FindJPEG) include(FindJPEG)
endif() endif()
endif() endif()
if(WITH_JPEG AND NOT JPEG_FOUND) if(WITH_JPEG AND NOT JPEG_FOUND)
unset_all(JPEG_LIBRARY JPEG_LIBRARIES JPEG_INCLUDE_DIR)
set(JPEG_LIBRARY libjpeg) set(JPEG_LIBRARY libjpeg)
set(JPEG_LIBRARIES ${JPEG_LIBRARY}) set(JPEG_LIBRARIES ${JPEG_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjpeg") add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjpeg")
@ -54,13 +66,15 @@ endif()
################### libjasper - optional (should be searched after libjpeg) ################### libjasper - optional (should be searched after libjpeg)
if(WITH_JASPER) if(WITH_JASPER)
if(BUILD_JASPER) if(BUILD_JASPER)
set(JASPER_FOUND FALSE) unset_all(JASPER_FOUND)
else() else()
include(FindJasper) include(FindJasper)
endif() endif()
endif() endif()
if(WITH_JASPER AND NOT JASPER_FOUND) if(WITH_JASPER AND NOT JASPER_FOUND)
unset_all(JASPER_LIBRARY JASPER_LIBRARIES JASPER_INCLUDE_DIR)
set(JASPER_LIBRARY libjasper) set(JASPER_LIBRARY libjasper)
set(JASPER_LIBRARIES ${JASPER_LIBRARY}) set(JASPER_LIBRARIES ${JASPER_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjasper") add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjasper")
@ -70,7 +84,7 @@ endif()
################### libpng - optional (should be searched after zlib) ################### libpng - optional (should be searched after zlib)
if(WITH_PNG) if(WITH_PNG)
if(BUILD_PNG) if(BUILD_PNG)
set(PNG_FOUND FALSE) unset_all(PNG_FOUND)
else() else()
include(FindPNG) include(FindPNG)
if(PNG_FOUND) if(PNG_FOUND)
@ -81,16 +95,13 @@ if(WITH_PNG)
endif() endif()
if(WITH_PNG AND NOT PNG_FOUND) if(WITH_PNG AND NOT PNG_FOUND)
unset_all(PNG_LIBRARY PNG_LIBRARIES PNG_INCLUDE_DIR PNG_PNG_INCLUDE_DIR HAVE_PNG_H HAVE_LIBPNG_PNG_H PNG_DEFINITIONS)
set(PNG_LIBRARY libpng) set(PNG_LIBRARY libpng)
set(PNG_LIBRARIES ${PNG_LIBRARY}) set(PNG_LIBRARIES ${PNG_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libpng") add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libpng")
set(PNG_INCLUDE_DIR "${${PNG_LIBRARY}_SOURCE_DIR}") set(PNG_INCLUDE_DIR "${${PNG_LIBRARY}_SOURCE_DIR}")
set(PNG_DEFINITIONS "") set(PNG_DEFINITIONS "")
unset(HAVE_LIBPNG_PNG_H CACHE)
unset(HAVE_PNG_H CACHE)
unset(HAVE_PNG_H CACHE)
unset(PNG_LIBRARY CACHE)
unset(PNG_PNG_INCLUDE_DIR CACHE)
endif() endif()
################### OpenEXR - optional ################### OpenEXR - optional