diff --git a/CMakeLists.txt b/CMakeLists.txt index 55a528956b..5ad2569a7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -780,18 +780,18 @@ endif() # ---------------------------------------------------------------------------- # Build-in 3rd parties. Should be after c++ standard potential modification # ---------------------------------------------------------------------------- -VP_OPTION(WITH_PTHREAD "" "" "Build pthread as built-in library" "" ON IF (WIN32 OR MINGW) AND (NOT WINRT)) +VP_OPTION(WITH_PTHREAD "" "" "Use pthread as built-in library" "" ON IF (WIN32 OR MINGW) AND (NOT WINRT)) # Since C99 is not supported by MSVC 2010 or prior, we disable apriltag if MSVC < 2012 -VP_OPTION(WITH_APRILTAG "" "" "Build AprilTag as built-in library" "" ON IF (USE_THREADS OR USE_PTHREAD OR WITH_PTHREAD) AND (NOT WINRT) AND (NOT MSVC_VERSION LESS 1700)) -VP_OPTION(WITH_APRILTAG_BIG_FAMILY "" "" "Build AprilTag big family (41h12, 48h12, 49h12, 52h13)" "" OFF IF WITH_APRILTAG) -VP_OPTION(WITH_MINIZ "" "" "Enable npz related I/O functions." "" ON) -VP_OPTION(WITH_ATIDAQ "" "" "Build atidaq-c as built-in library" "" ON IF USE_COMEDI AND NOT WINRT) -VP_OPTION(WITH_CLIPPER "" "" "Build clipper as built-in library" "" ON IF USE_OPENCV) -VP_OPTION(WITH_LAPACK "" "" "Build lapack as built-in library" "" ON IF NOT USE_LAPACK) -VP_OPTION(WITH_QBDEVICE "" "" "Build qbdevice-api as built-in library" "" ON IF (NOT WINRT) AND (NOT IOS)) -VP_OPTION(WITH_TAKKTILE2 "" "" "Build Right Hand takktile2 driver as built-in library" "" ON IF (NOT WIN32) AND (NOT WINRT) AND (NOT IOS) AND (NOT ANDROID)) +VP_OPTION(WITH_APRILTAG "" "" "Use AprilTag as built-in library" "" ON IF (USE_THREADS OR USE_PTHREAD OR WITH_PTHREAD) AND (NOT WINRT) AND (NOT MSVC_VERSION LESS 1700)) +VP_OPTION(WITH_APRILTAG_BIG_FAMILY "" "" "Use AprilTag big family (41h12, 48h12, 49h12, 52h13)" "" OFF IF WITH_APRILTAG) +VP_OPTION(WITH_MINIZ "" "" "Use npz related I/O as built-in functions" "" ON) +VP_OPTION(WITH_ATIDAQ "" "" "Use atidaq-c as built-in library" "" ON IF USE_COMEDI AND NOT WINRT) +VP_OPTION(WITH_CLIPPER "" "" "Use clipper as built-in library" "" ON IF USE_OPENCV) +VP_OPTION(WITH_LAPACK "" "" "Use lapack as built-in library" "" ON IF NOT USE_LAPACK) +VP_OPTION(WITH_QBDEVICE "" "" "Use qbdevice-api as built-in library" "" ON IF (NOT WINRT) AND (NOT IOS)) +VP_OPTION(WITH_TAKKTILE2 "" "" "Use Right Hand takktile2 driver as built-in library" "" ON IF (NOT WIN32) AND (NOT WINRT) AND (NOT IOS) AND (NOT ANDROID)) VP_OPTION(WITH_CATCH2 "" "" "Use catch2 built-in library" "" ON) -VP_OPTION(WITH_POLOLU "" "" "Build rapa pololu as built-in library" "" ON IF (NOT WINRT) AND (NOT IOS) AND (NOT ANDROID)) +VP_OPTION(WITH_POLOLU "" "" "Use rapa pololu as built-in library" "" ON IF (NOT WINRT) AND (NOT IOS) AND (NOT ANDROID)) VP_OPTION(WITH_PUGIXML "" "" "Use pugixml built-in third-party" "" ON) VP_OPTION(WITH_SIMDLIB "" "" "Use simdlib built-in third-party" "" ON) VP_OPTION(WITH_STBIMAGE "" "" "Use std_image built-in third-party" "" ON) @@ -1150,7 +1150,7 @@ VP_SET(VISP_HAVE_SIMDLIB TRUE IF (BUILD_MODULE_visp_core AND WITH_SIMDLIB)) VP_SET(VISP_HAVE_STBIMAGE TRUE IF (BUILD_MODULE_visp_core AND WITH_STBIMAGE)) VP_SET(VISP_HAVE_TINYEXR TRUE IF (BUILD_MODULE_visp_core AND WITH_TINYEXR)) VP_SET(VISP_HAVE_PUGIXML TRUE IF (BUILD_MODULE_visp_core AND WITH_PUGIXML)) -VP_SET(VISP_HAVE_MINIZ TRUE IF (BUILD_MODULE_visp_core AND WITH_MINIZ)) +VP_SET(VISP_HAVE_MINIZ TRUE IF (BUILD_MODULE_visp_core AND WITH_MINIZ)) VP_SET(VISP_HAVE_QUALISYS TRUE IF (BUILD_MODULE_visp_sensor AND USE_QUALISYS)) VP_SET(VISP_HAVE_VICON TRUE IF (BUILD_MODULE_visp_sensor AND USE_VICON)) @@ -1745,7 +1745,7 @@ status(" Use OpenCV:" USE_OPENCV THEN "yes (ver ${OpenCV_VE status(" Use stb_image (built-in):" WITH_STBIMAGE THEN "yes (ver ${STBIMAGE_VERSION})" ELSE "no") status(" Use TinyEXR (built-in):" WITH_TINYEXR THEN "yes (ver ${TINYEXR_VERSION})" ELSE "no") status(" Use simdlib (built-in):" WITH_SIMDLIB THEN "yes" ELSE "no") -status(" Enable npz I/O functions:" WITH_MINIZ THEN "yes" ELSE "no") +status(" Use npz I/O (built-in):" WITH_MINIZ THEN "yes" ELSE "no") status("") status(" Real robots: ") status(" Use Afma4:" USE_AFMA4 THEN "yes" ELSE "no") diff --git a/cmake/templates/VISPConfig.cmake.in b/cmake/templates/VISPConfig.cmake.in index 23c27cebe5..e84df6cabf 100644 --- a/cmake/templates/VISPConfig.cmake.in +++ b/cmake/templates/VISPConfig.cmake.in @@ -229,6 +229,7 @@ set(VISP_HAVE_LIBFREENECT_AND_DEPENDENCIES "@VISP_HAVE_LIBFREENECT_AND_DEPENDENC set(VISP_HAVE_LIBFREENECT_OLD "@VISP_HAVE_LIBFREENECT_OLD@") set(VISP_HAVE_LIBUSB_1 "@VISP_HAVE_LIBUSB_1@") set(VISP_HAVE_MAVSDK "@VISP_HAVE_MAVSDK@") +set(VISP_HAVE_MINIZ "@VISP_HAVE_MINIZ@") set(VISP_HAVE_MKL "@VISP_HAVE_MKL@") set(VISP_HAVE_NETLIB "@VISP_HAVE_NETLIB@") set(VISP_HAVE_NULLPTR "@VISP_HAVE_NULLPTR@") diff --git a/cmake/templates/vpConfig.h.in b/cmake/templates/vpConfig.h.in index e814c30ec7..fbd4e76c20 100644 --- a/cmake/templates/vpConfig.h.in +++ b/cmake/templates/vpConfig.h.in @@ -158,7 +158,7 @@ namespace VISP_NAMESPACE_NAME {} // Always define pugixml for compatibility. #cmakedefine VISP_HAVE_PUGIXML -// Defined if basisu_miniz is available +// Defined if basisu_miniz is used internally #cmakedefine VISP_HAVE_MINIZ // Defined if XML2 library available. diff --git a/doc/config-doxygen.in b/doc/config-doxygen.in index b7e001c481..23d5cbff80 100644 --- a/doc/config-doxygen.in +++ b/doc/config-doxygen.in @@ -2390,6 +2390,7 @@ PREDEFINED = @DOXYGEN_SHOULD_SKIP_THIS@ \ VISP_HAVE_LIBFREENECT_AND_DEPENDENCIES \ VISP_HAVE_LIBUSB_1 \ VISP_HAVE_MAVSDK \ + VISP_HAVE_MINIZ \ VISP_HAVE_NLOHMANN_JSON \ VISP_HAVE_NULLPTR \ VISP_HAVE_OCCIPITAL_STRUCTURE \