diff --git a/modules/ar/CMakeLists.txt b/modules/ar/CMakeLists.txt index 47717d8f7a..15c70e9c76 100644 --- a/modules/ar/CMakeLists.txt +++ b/modules/ar/CMakeLists.txt @@ -47,14 +47,14 @@ if(USE_OGRE) mark_as_advanced(OGRE_SAMPLES_INCLUDEPATH) #message("OGRE_SAMPLES_INCLUDEPATH: ${OGRE_SAMPLES_INCLUDEPATH}") if(OGRE_SAMPLES_INCLUDEPATH) - list(APPEND opt_incs ${OGRE_SAMPLES_INCLUDEPATH}) + list(APPEND opt_system_incs ${OGRE_SAMPLES_INCLUDEPATH}) endif() # hack to fix possible presence of NOTFOUND in OGRE_INCLUDE_DIRS #message("OGRE_INCLUDE_DIRS: ${OGRE_INCLUDE_DIRS}") foreach(inc_ ${OGRE_INCLUDE_DIRS}) if(NOT ${inc_} MATCHES "NOTFOUND") - list(APPEND opt_incs ${inc_}) + list(APPEND opt_system_incs ${inc_}) endif() endforeach() if(WIN32) @@ -71,7 +71,7 @@ if(USE_OGRE) endif(USE_OGRE) if(USE_OIS AND USE_OGRE) - list(APPEND opt_incs ${OIS_INCLUDE_DIR}) + list(APPEND opt_system_incs ${OIS_INCLUDE_DIR}) list(APPEND opt_libs ${OIS_LIBRARIES}) if(APPLE) # With Ogre 1.7.4 and 1.8.1 to be able to link with libOIS.a, Cocoa framework is requested. @@ -188,10 +188,6 @@ endif() vp_add_module(ar visp_core) vp_glob_module_sources() -if(USE_OGRE) - # Add specific build flag to turn off warnings coming from libogre and libois 3rd party - vp_set_source_file_compile_flag(src/ogre-simulator/vpAROgre.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) -endif() vp_module_include_directories(${opt_incs} SYSTEM ${opt_system_incs}) vp_create_module(${opt_libs}) diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt index 69db0c63a3..bb3b8c74e8 100644 --- a/modules/core/CMakeLists.txt +++ b/modules/core/CMakeLists.txt @@ -37,6 +37,7 @@ # Add optional 3rd parties set(opt_incs "") +set(opt_system_incs "") set(opt_libs "") set(opt_libs_private "") @@ -156,6 +157,7 @@ if(USE_OPENCV) list(APPEND opt_libs ${OpenCV_LIBS}) endif() if(OpenCV_INCLUDE_DIRS) + # Append OpenCV include dirs as system to avoid warnings coming from OpenCV headers list(APPEND opt_incs ${OpenCV_INCLUDE_DIRS}) endif() endif(USE_OPENCV) @@ -206,9 +208,9 @@ endif(USE_YARP) # Math: eigen3, gsl, mkl, openblas, atlas, netlib, OpenCV if(USE_EIGEN3) if(EIGEN3_INCLUDE_DIRS) - list(APPEND opt_incs ${EIGEN3_INCLUDE_DIRS}) + list(APPEND opt_system_incs ${EIGEN3_INCLUDE_DIRS}) else() - list(APPEND opt_incs ${EIGEN3_INCLUDE_DIR}) + list(APPEND opt_system_incs ${EIGEN3_INCLUDE_DIR}) endif() endif() @@ -300,109 +302,6 @@ if(WITH_SIMDLIB) list(APPEND opt_libs_private ${SIMDLIB_LIBRARIES}) endif() -if(MSVC) - # Disable Visual C++ C4996 warning - # warning C4996: 'gethostbyname': Use getaddrinfo() or GetAddrInfoW() instead - # warning C4996: 'inet_ntoa': Use inet_ntop() or InetNtop() instead - # warning C4996: 'inet_addr': Use inet_pton() or InetPton() instead - if(BUILD_SHARED_LIBS) - vp_set_source_file_compile_flag(src/tools/network/vpClient.cpp /wd4996) - vp_set_source_file_compile_flag(src/tools/network/vpServer.cpp /wd4996) - vp_set_source_file_compile_flag(src/tools/network/vpNetwork.cpp /wd4996) - vp_set_source_file_compile_flag(src/math/random-generator/vpUniRand.cpp /wd4146) - if(BUILD_TESTS) - vp_set_source_file_compile_flag(test/network/testClient.cpp /wd4996) - vp_set_source_file_compile_flag(test/network/testServer.cpp /wd4996) - endif() - else() - vp_warnings_disable(CMAKE_CXX_FLAGS /wd4996) - endif() -endif() - -if(USE_EIGEN3) - vp_set_source_file_compile_flag(src/math/matrix/vpMatrix_svd.cpp -Wno-float-equal -Wno-strict-overflow -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-deprecated-copy -Wno-shadow -Wno-maybe-uninitialized) - vp_set_source_file_compile_flag(src/math/matrix/vpMatrix_lu.cpp -Wno-float-equal -Wno-strict-overflow -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-deprecated-copy -Wno-shadow) - vp_set_source_file_compile_flag(src/math/matrix/vpEigenConversion.cpp -Wno-float-equal -Wno-strict-overflow -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-shadow) - vp_set_source_file_compile_flag(test/math/testEigenConversion.cpp -Wno-float-equal -Wno-strict-overflow -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-shadow) - vp_set_source_file_compile_flag(test/math/perfMatrixMultiplication.cpp -Wno-strict-overflow -Wno-misleading-indentation -Wno-float-equal -Wno-deprecated-copy -Wno-int-in-bool-context -Wno-shadow) - vp_set_source_file_compile_flag(test/math/perfMatrixTranspose.cpp -Wno-misleading-indentation -Wno-float-equal -Wno-deprecated-copy -Wno-int-in-bool-context -Wno-shadow) -endif() - -vp_set_source_file_compile_flag(src/image/vpImageConvert.cpp -Wno-strict-overflow -Wno-sign-compare -Wno-float-equal) -vp_set_source_file_compile_flag(src/image/vpImageFilter.cpp -Wno-strict-overflow -Wno-float-equal) -vp_set_source_file_compile_flag(src/image/vpImageTools.cpp -Wno-strict-overflow -Wno-float-equal) -vp_set_source_file_compile_flag(src/tools/network/vpServer.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/tools/optimization/vpQuadProg.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/tools/optimization/vpLinProg.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/tools/histogram/vpHistogram.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/image/vpFont.cpp -Wno-float-equal -Wno-strict-overflow) -# To avoid warnings with basisu_miniz.h such as: -# basisu_miniz.h:1184:9: warning: this ‘for’ clause does not guard... [-Wmisleading-indentation] -vp_set_source_file_compile_flag(src/tools/file/vpIoTools.cpp -Wno-misleading-indentation -Wno-strict-aliasing -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/munkres/vpMunkres.cpp /wd26812 /wd4244) -vp_set_source_file_compile_flag(test/image/testImageBinarise.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(test/image/testImageOwnership.cpp -Wno-pessimizing-move) -vp_set_source_file_compile_flag(test/network/testClient.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(test/network/testServer.cpp -Wno-strict-overflow) - -if(USE_OPENCV) - vp_set_source_file_compile_flag(src/camera/vpColorDepthConversion.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/camera/vpMeterPixelConversion.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/camera/vpPixelMeterConversion.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/display/vpDisplay.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/display/vpDisplay_rgba.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/display/vpDisplay_uchar.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/display/vpFeatureDisplay.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/image/vpGaussianFilter.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/image/vpImageDraw.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/math/matrix/vpMatrix_cholesky.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/tools/convert/vpConvert.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/tools/geometry/vpPolygon.cpp -Wno-float-equal -Wno-strict-overflow) - vp_set_source_file_compile_flag(src/tools/geometry/vpPolygon3D.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/tools/histogram/vpHistogram.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/tracking/moments/vpMomentObject.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/camera/testCameraParametersConversion.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image/testImageResize.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image/testImageMorphology.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/testColorConversion.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/testConversion.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/testCrop.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/testCropAdvanced.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/testGaussianFilter.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/testImageAddSub.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/testImageFilter.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/testImageComparison.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/testImageNormalizedCorrelation.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/testImageTemplateMatching.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/testImageWarp.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/testIoPGM.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/testIoPPM.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/testReadImage.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/testPerformanceLUT.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/testUndistortImage.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/perfImageAddSub.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/perfImageMorphology.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/perfImageResize.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/perfImageWarp.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/perfGaussianFilter.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/perfColorConversion.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image/testImageDraw.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image/testImageDifference.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/math/testMomentAlpha.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/tools/convert/testConvert.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/tools/histogram-with-dataset/testHistogram.cpp -Wno-float-equal) -endif() - -if(USE_XML2) - if(MSVC) - vp_set_source_file_compile_flag(src/tools/xml/vpXmlParser.cpp /wd4996) - vp_set_source_file_compile_flag(test/tools/xml/testXmlParser.cpp /wd4996) - else() - vp_set_source_file_compile_flag(src/tools/xml/vpXmlParser.cpp -Wno-deprecated-declarations) - vp_set_source_file_compile_flag(test/tools/xml/testXmlParser.cpp -Wno-deprecated-declarations) - endif() -endif() - vp_add_module(core PRIVATE_OPTIONAL ${opt_libs_private} WRAP java) #----------------------------------------------------------------------------- @@ -421,7 +320,7 @@ endif() vp_source_group("Src" FILES "${VISP_MODULE_visp_core_BINARY_DIR}/version_string.inc") vp_glob_module_sources(SOURCES "${VISP_MODULE_visp_core_BINARY_DIR}/version_string.inc") -vp_module_include_directories(${opt_incs}) +vp_module_include_directories(${opt_incs} SYSTEM ${opt_system_incs}) vp_create_module(${opt_libs}) vp_create_compat_headers("include/visp3/core/vpConfig.h") vp_add_tests(CTEST_EXCLUDE_PATH network DEPENDS_ON visp_io visp_gui) diff --git a/modules/detection/CMakeLists.txt b/modules/detection/CMakeLists.txt index 1d6faf556e..fc62ba2f44 100644 --- a/modules/detection/CMakeLists.txt +++ b/modules/detection/CMakeLists.txt @@ -35,10 +35,11 @@ # Add optional 3rd parties set(opt_incs "") +set(opt_system_incs "") set(opt_libs "") if(USE_ZBAR) - list(APPEND opt_incs ${ZBAR_INCLUDE_DIRS}) + list(APPEND opt_system_incs ${ZBAR_INCLUDE_DIRS}) list(APPEND opt_libs ${ZBAR_LIBRARIES}) endif() @@ -47,11 +48,6 @@ if(USE_DMTX) list(APPEND opt_libs ${DMTX_LIBRARIES}) endif() -if(USE_ZBAR) - # Add specific build flag to turn off warnings coming from zbar 3rd party - vp_set_source_file_compile_flag(src/barcode/vpDetectorQRCode.cpp -Wno-unused-parameter -Wno-deprecated-declarations) -endif() - if(WITH_APRILTAG) # April Tag is private include_directories(${APRILTAG_INCLUDE_DIRS}) @@ -195,6 +191,6 @@ endif(USE_OPENCV) vp_add_module(detection visp_core visp_vision PRIVATE_OPTIONAL ${APRILTAG_LIBRARIES} WRAP java) vp_glob_module_sources() -vp_module_include_directories(${opt_incs}) +vp_module_include_directories(${opt_incs} SYSTEM ${opt_system_incs}) vp_create_module(${opt_libs}) vp_add_tests(DEPENDS_ON visp_detection visp_gui visp_io) diff --git a/modules/gui/CMakeLists.txt b/modules/gui/CMakeLists.txt index 67d27e5ccf..d9cd8ac7b8 100644 --- a/modules/gui/CMakeLists.txt +++ b/modules/gui/CMakeLists.txt @@ -76,29 +76,3 @@ vp_glob_module_sources() vp_module_include_directories(${opt_incs}) vp_create_module(${opt_libs}) vp_add_tests(DEPENDS_ON visp_io) - -if(USE_X11) - vp_set_source_file_compile_flag(src/display/vpDisplayX.cpp -Wno-strict-overflow) -endif() -if(USE_OPENCV) - vp_set_source_file_compile_flag(src/display/vpDisplayOpenCV.cpp -Wno-strict-overflow -Wno-float-equal) - vp_set_source_file_compile_flag(src/forward-projection/vpProjectionDisplay.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/plot/vpPlot.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/plot/vpPlotCurve.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/plot/vpPlotGraph.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/display/testDisplayPolygonLines.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/display/testDisplayRoi.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/display/testDisplays.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/display/testVideoDevice.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/display/testVideoDeviceDual.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/display-with-dataset/testMouseEvent.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/display-with-dataset/testDisplayScaled.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/display-with-dataset/testClick.cpp -Wno-float-equal) -endif() -if(USE_GTK2) - vp_set_source_file_compile_flag(src/display/vpDisplayGTK.cpp -Wno-deprecated-declarations) -endif() -if(USE_PCL) - vp_set_source_file_compile_flag(src/pointcloud/vpDisplayPCL.cpp -Wno-unused-parameter) - vp_set_source_file_compile_flag(src/pointcloud/vpPclViewer.cpp -Wno-unused-parameter) -endif() diff --git a/modules/imgproc/CMakeLists.txt b/modules/imgproc/CMakeLists.txt index 5d281d34f4..114f9d2e5f 100644 --- a/modules/imgproc/CMakeLists.txt +++ b/modules/imgproc/CMakeLists.txt @@ -49,19 +49,3 @@ vp_module_include_directories() vp_create_module() vp_add_tests(DEPENDS_ON visp_imgproc visp_io) - -vp_set_source_file_compile_flag(src/vpCLAHE.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/vpThreshold.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/vpFloodFill.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(test/testContours.cpp -Wno-strict-overflow) - -if(USE_OPENCV) - vp_set_source_file_compile_flag(src/vpCLAHE.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/vpImgproc.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/with-dataset/testAutoThreshold.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/with-dataset/testImgproc.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/with-dataset/testConnectedComponents.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/with-dataset/testFloodFill.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/with-dataset/testContours.cpp -Wno-float-equal) - vp_set_source_file_compile_flag( -Wno-float-equal) -endif() diff --git a/modules/io/CMakeLists.txt b/modules/io/CMakeLists.txt index f93ece86d2..fb65d48983 100644 --- a/modules/io/CMakeLists.txt +++ b/modules/io/CMakeLists.txt @@ -199,20 +199,5 @@ vp_module_include_directories(${opt_incs}) vp_create_module(${opt_libs}) vp_add_tests() -vp_set_source_file_compile_flag(src/tools/vpParseArgv.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/image/vpImageIo.cpp -Wno-missing-field-initializers) # since stb_image_write.h update from v1.13 to v1.16 vp_set_source_file_compile_flag(src/image/private/vpImageIoStb.cpp -Wno-missing-field-initializers -Wno-strict-overflow) vp_set_source_file_compile_flag(src/image/private/vpImageIoTinyEXR.cpp -Wno-strict-overflow -Wno-sign-compare -Wno-type-limits -Wno-unused-but-set-variable) - -if(USE_OPENCV) - vp_set_source_file_compile_flag(src/image/private/vpImageIoLibjpeg.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/image/private/vpImageIoLibpng.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/image/private/vpImageIoOpenCV.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/image/private/vpImageIoPortable.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/image/vpImageIo.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/video/vpDiskGrabber.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/video/vpVideoReader.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/video/vpVideoWriter.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/video/testVideo.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/image-with-dataset/perfImageLoadSave.cpp -Wno-float-equal) -endif() diff --git a/modules/robot/CMakeLists.txt b/modules/robot/CMakeLists.txt index 0287a79924..1cc26584d3 100644 --- a/modules/robot/CMakeLists.txt +++ b/modules/robot/CMakeLists.txt @@ -35,6 +35,7 @@ # Add optional 3rd parties set(opt_incs "") +set(opt_system_incs "") set(opt_libs "") set(opt_libs_private "") @@ -47,7 +48,7 @@ set(opt_libs_private "") # Haption Virtuose SDK. # This 3rd party should be the first used by the module (see warning below) if(USE_VIRTUOSE) - list(APPEND opt_incs ${VIRTUOSE_INCLUDE_DIRS}) + list(APPEND opt_system_incs ${VIRTUOSE_INCLUDE_DIRS}) list(APPEND opt_libs ${VIRTUOSE_LIBRARIES}) if(USE_THREADS AND RT_FOUND AND DL_FOUND) @@ -61,21 +62,6 @@ if(USE_VIRTUOSE) if(MSVC) # Work around to remove warning LNK4099; PDB vc120.pdb not found with virtuoseDLL.lib set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /ignore:4099") - - # Disable Visual C++ C4312 warning occuring on 3rd party VirtuoseAPI.h file - # VirtuoseAPI.h(280): warning C4312: 'type cast': conversion from 'int' to 'char *' of greater size - # VirtuoseAPI.h(302): warning C4312: 'type cast': conversion from 'int' to 'VirtContext' of greater size - if(BUILD_SHARED_LIBS) - vp_set_source_file_compile_flag(src/haptic-device/virtuose/vpVirtuose.cpp /wd4312) - vp_set_source_file_compile_flag(test/virtuose/testVirtuose.cpp /wd4312) - vp_set_source_file_compile_flag(test/virtuose/testVirtuoseAfma6.cpp /wd4312) - vp_set_source_file_compile_flag(test/virtuose/testVirtuoseHapticBox.cpp /wd4312) - vp_set_source_file_compile_flag(test/virtuose/testVirtuoseJointLimits.cpp /wd4312) - vp_set_source_file_compile_flag(test/virtuose/testVirtuosePeriodicFunction.cpp /wd4312) - vp_set_source_file_compile_flag(test/virtuose/testVirtuoseWithGlove.cpp /wd4312) - else() - vp_warnings_disable(CMAKE_CXX_FLAGS /wd4312) - endif() endif() endif() @@ -124,7 +110,7 @@ endif() if(USE_ARIA AND UNIX AND USE_PTHREAD AND RT_FOUND AND DL_FOUND) # Under Unix we need Aria, pthread, dl and rt libraries - list(APPEND opt_incs ${ARIA_INCLUDE_DIRS}) + list(APPEND opt_system_incs ${ARIA_INCLUDE_DIRS}) list(APPEND opt_libs ${ARIA_LIBRARIES}) if(CMAKE_THREAD_LIBS_INIT) list(APPEND opt_libs "${CMAKE_THREAD_LIBS_INIT}") @@ -132,7 +118,7 @@ if(USE_ARIA AND UNIX AND USE_PTHREAD AND RT_FOUND AND DL_FOUND) list(APPEND opt_libs ${RT_LIBRARIES}) list(APPEND opt_libs ${DL_LIBRARIES}) elseif(USE_ARIA AND NOT UNIX) - list(APPEND opt_incs ${ARIA_INCLUDE_DIRS}) + list(APPEND opt_system_incs ${ARIA_INCLUDE_DIRS}) list(APPEND opt_libs ${ARIA_LIBRARIES}) endif() @@ -196,96 +182,17 @@ vp_glob_module_sources() vp_set_source_file_compile_flag(src/wireframe-simulator/vpKeyword.cpp -Wno-sign-conversion) -if(USE_VIRTUOSE) - # Add specific build flag to turn off warnings coming from VirtuoseAPI 3rd party - vp_set_source_file_compile_flag(src/haptic-device/virtuose/vpVirtuose.cpp -Wno-int-to-pointer-cast) -endif() - -if(USE_ARIA) - # Add specific build flag to turn off warnings coming from libaria 3rd party - vp_set_source_file_compile_flag(src/real-robot/pioneer/vpRobotPioneer.cpp -Wno-unused-parameter -Wno-type-limits) -endif() - -if(USE_COIN3D) - # Add specific build flag to turn off warnings coming from libcoin 3rd party - vp_set_source_file_compile_flag(src/wireframe-simulator/vpWireFrameSimulator.cpp -Wno-unused-parameter) - vp_set_source_file_compile_flag(src/wireframe-simulator/vpScene.cpp -Wno-unused-parameter -Wno-deprecated-copy) - vp_set_source_file_compile_flag(src/image-simulator/vpImageSimulator.cpp -Wno-unused-parameter) - vp_set_source_file_compile_flag(src/robot-simulator/vpRobotCamera.cpp -Wno-unused-parameter) - vp_set_source_file_compile_flag(src/robot-simulator/vpSimulatorCamera.cpp -Wno-unused-parameter) - vp_set_source_file_compile_flag(src/robot-simulator/vpSimulatorViper850.cpp -Wno-unused-parameter) - vp_set_source_file_compile_flag(src/robot-simulator/vpSimulatorAfma6.cpp -Wno-unused-parameter) - vp_set_source_file_compile_flag(src/robot-simulator/vpRobotWireFrameSimulator.cpp -Wno-unused-parameter) - - if(USE_VIPER850) - vp_set_source_file_compile_flag(src/real-robot/viper/vpRobotViper850.cpp -Wno-unused-parameter) - endif() -else() - vp_set_source_file_compile_flag(src/wireframe-simulator/vpWireFrameSimulator.cpp -Wno-strict-overflow) -endif() - -if(USE_UR_RTDE) - vp_set_source_file_compile_flag(src/real-robot/universal-robots/vpRobotUniversalRobots.cpp -Wno-unused-parameter) -endif() - -if(USE_MAVSDK) - vp_set_source_file_compile_flag(src/real-robot/mavsdk/vpRobotMavsdk.cp -Wno-unused-but-set-variable) -endif() - -if(USE_BICLOPS) - vp_set_source_file_compile_flag(src/real-robot/biclops/vpRobotBiclops.cpp -Wno-unused-parameter) - vp_set_source_file_compile_flag(src/real-robot/biclops/private/vpRobotBiclopsController_impl.cpp -Wno-unused-parameter) -endif() - -vp_set_source_file_compile_flag(src/light/vpRingLight.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/wireframe-simulator/vpClipping.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/wireframe-simulator/vpBoundio.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/wireframe-simulator/vpCoreDisplay.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/wireframe-simulator/vpLex.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/wireframe-simulator/vpBound.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/wireframe-simulator/vpArit.cpp -Wno-strict-overflow) - # copy robot and wireframe simulator data vp_glob_module_copy_data("src/robot-simulator/arms/*.bnd" data/robot-simulator) vp_glob_module_copy_data("src/wireframe-simulator/scene/*.bnd" data/wireframe-simulator) vp_glob_module_copy_data("src/wireframe-simulator/scene/*.sld" data/wireframe-simulator) -vp_module_include_directories(${opt_incs}) +vp_module_include_directories(${opt_incs} SYSTEM ${opt_system_incs}) vp_create_module(${opt_libs}) vp_add_tests( DEPENDS_ON visp_sensor visp_vision visp_blob visp_gui CTEST_EXCLUDE_PATH bebop2 qbdevice servo-afma4 servo-afma6 servo-franka servo-pixhawk servo-pololu servo-universal-robots - servo-viper virtuose) - -if(USE_VIRTUOSE) - # Add specific build flag to turn off warnings coming from VirtuoseAPI 3rd party - vp_set_source_file_compile_flag(test/virtuose/testVirtuose.cpp -Wno-int-to-pointer-cast) - vp_set_source_file_compile_flag(test/virtuose/testVirtuoseAfma6.cpp -Wno-int-to-pointer-cast) - vp_set_source_file_compile_flag(test/virtuose/testVirtuoseWithGlove.cpp -Wno-int-to-pointer-cast) - vp_set_source_file_compile_flag(test/virtuose/testVirtuose.cpp -Wno-int-to-pointer-cast) - vp_set_source_file_compile_flag(test/virtuose/testVirtuoseHapticBox.cpp -Wno-int-to-pointer-cast) - vp_set_source_file_compile_flag(test/virtuose/testVirtuoseJointLimits.cpp -Wno-int-to-pointer-cast) - vp_set_source_file_compile_flag(test/virtuose/testVirtuosePeriodicFunction.cpp -Wno-int-to-pointer-cast) -endif() - -if(USE_ARSDK) - vp_set_source_file_compile_flag(src/real-robot/bebop2/vpRobotBebop2.cpp -Wno-old-style-cast -Wno-implicit-fallthrough -Wno-cast-qual -Wno-deprecated-declarations) -endif() - -if(USE_FRANKA) - vp_set_source_file_compile_flag(src/real-robot/franka/vpForceTorqueGenerator_impl.cpp -Wno-shadow -Wno-deprecated-copy) -endif() - -if(USE_FLIRPTUSDK) - vp_set_source_file_compile_flag(test/servo-flir-ptu/testRobotFlirPtu.cpp -Wno-unused-result) -endif() - -if(USE_UR_RTDE) - vp_set_source_file_compile_flag(test/servo-universal-robots/testUniversalRobotsCartPosition.cpp -Wno-unused-parameter) - vp_set_source_file_compile_flag(test/servo-universal-robots/testUniversalRobotsCartVelocity.cpp -Wno-unused-parameter) - vp_set_source_file_compile_flag(test/servo-universal-robots/testUniversalRobotsGetData.cpp -Wno-unused-parameter) - vp_set_source_file_compile_flag(test/servo-universal-robots/testUniversalRobotsJointPosition.cpp -Wno-unused-parameter) - vp_set_source_file_compile_flag(test/servo-universal-robots/testUniversalRobotsJointVelocity.cpp -Wno-unused-parameter) -endif() + servo-viper virtuose +) diff --git a/modules/sensor/CMakeLists.txt b/modules/sensor/CMakeLists.txt index ccd858c29c..5f8596fac0 100644 --- a/modules/sensor/CMakeLists.txt +++ b/modules/sensor/CMakeLists.txt @@ -37,6 +37,7 @@ # Add optional 3rd parties set(opt_incs "") +set(opt_system_incs "") set(opt_libs "") # camera devices: v4l, dc1394, cmu1394, directshow ?, freenect, @@ -86,7 +87,7 @@ if(USE_REALSENSE) list(APPEND opt_libs ${REALSENSE_LIBRARIES}) endif() if(USE_REALSENSE2) - list(APPEND opt_incs ${REALSENSE2_INCLUDE_DIRS}) + list(APPEND opt_system_incs ${REALSENSE2_INCLUDE_DIRS}) list(APPEND opt_libs ${REALSENSE2_LIBRARIES}) endif() if(USE_OCCIPITAL_STRUCTURE) @@ -123,127 +124,9 @@ endif() vp_add_module(sensor visp_core PRIVATE_OPTIONAL ${ATIDAQ_LIBRARIES}) vp_glob_module_sources() -vp_module_include_directories(${opt_incs}) +vp_module_include_directories(${opt_incs} SYSTEM ${opt_system_incs}) vp_create_module(${opt_libs}) vp_add_tests(CTEST_EXCLUDE_PATH force-torque framegrabber mocap rgb-depth DEPENDS_ON visp_io visp_gui) # Add configuration file for IIT FT sensor besides testForceTorqueIitSensor.cpp binary configure_file(test/force-torque/configurationSettings.ini configurationSettings.ini COPYONLY) - -if(USE_FLYCAPTURE) - # Add specific build flag to turn off warnings coming from PointGrey flycapture 3rd party - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-unknown-pragmas") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-ignored-qualifiers") -endif() - -if(USE_PYLON) - # Add specific build flag to turn off warnings coming from Basler - # pylon headers - if(MSVC) - list(APPEND CXX_FLAGS_MUTE_WARNINGS "/wd4244") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "/wd4267") - else() - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-unknown-pragmas") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-unused-parameter") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-overloaded-virtual") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-deprecated-copy") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-unused-variable") - endif() -endif() - -if(USE_REALSENSE) - # Add specific build flag to turn off warnings coming from RealSense 3rd party - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-strict-aliasing") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-pessimizing-move") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-unused-parameter") -endif() - -if(USE_REALSENSE2) - if(UNIX) - # Add specific build flag to turn off warnings coming from PCL 3rd party - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-reorder") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-unused-function") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-sign-compare") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-overloaded-virtual") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-deprecated-declarations") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-inconsistent-missing-override") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-sign-conversion") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-float-equal") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-pessimizing-move") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-unused-parameter") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-comment") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-ignored-qualifiers") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-deprecated-copy") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-unqualified-std-cast-call") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-missing-field-initializers") - else() - list(APPEND CXX_FLAGS_MUTE_WARNINGS "/wd4244") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "/wd4267") - endif() -endif() - -if(USE_LIBFREENECT) - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-unused-parameter") -endif() - -if(USE_UEYE) - if(UNIX) - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-deprecated-declarations") - else() - list(APPEND CXX_FLAGS_MUTE_WARNINGS "/wd4996") - endif() -endif() - -if(USE_OPENCV) - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-float-equal") -endif() - -if(USE_OCCIPITAL_STRUCTURE) - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-reorder") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-unused-function") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-unused-parameter") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-sign-compare") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-overloaded-virtual") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-ignored-qualifiers") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-maybe-uninitialized") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-deprecated-declarations") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-inconsistent-missing-override") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-sign-conversion") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-float-equal") - list(APPEND CXX_FLAGS_MUTE_WARNINGS "-Wno-pessimizing-move") -endif() - -vp_set_source_file_compile_flag(src/force-torque/vpForceTorqueAtiNetFTSensor.cpp "-Wno-strict-aliasing") - -if(CXX_FLAGS_MUTE_WARNINGS) - # Add specific build flag to turn off warnings - vp_set_source_file_compile_flag(src/framegrabber/1394/vp1394TwoGrabber.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(src/framegrabber/directshow/vpDirectShowSampleGrabberI.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(src/framegrabber/flycapture/vpFlyCaptureGrabber.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(src/framegrabber/pylon/vpPylonFactory.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(src/framegrabber/pylon/vpPylonGrabberGigE.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(src/framegrabber/pylon/vpPylonGrabberUsb.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(src/framegrabber/ueye/vpUeyeGrabber.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(src/rgb-depth/kinect/vpKinect.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(src/rgb-depth/occipital_structure/vpOccipitalStructure.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(src/rgb-depth/realsense/vpRealSense.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(src/rgb-depth/realsense/vpRealSense2.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - - vp_set_source_file_compile_flag(test/framegrabber/test1394TwoResetBus.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(test/framegrabber/test1394TwoGrabber.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(test/framegrabber/testPylonGrabber.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(test/rgb-depth/testOccipitalStructure_Core_images.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(test/rgb-depth/testOccipitalStructure_Core_imu.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(test/rgb-depth/testOccipitalStructure_Core_pcl.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(test/rgb-depth/testRealSense2_SR300.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(test/rgb-depth/testRealSense2_D435.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(test/rgb-depth/testRealSense2_D435_align.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(test/rgb-depth/testRealSense2_D435_opencv.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(test/rgb-depth/testRealSense2_D435_pcl.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(test/rgb-depth/testRealSense2_T265_images.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(test/rgb-depth/testRealSense2_T265_images_odometry.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(test/rgb-depth/testRealSense2_T265_images_odometry_async.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(test/rgb-depth/testRealSense2_T265_imu.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(test/rgb-depth/testRealSense2_T265_odometry.cpp ${CXX_FLAGS_MUTE_WARNINGS}) - vp_set_source_file_compile_flag(test/rgb-depth/testRealSense2_T265_undistort.cpp ${CXX_FLAGS_MUTE_WARNINGS}) -endif() diff --git a/modules/tracker/blob/CMakeLists.txt b/modules/tracker/blob/CMakeLists.txt index 59184123ef..2d1de0ee2a 100644 --- a/modules/tracker/blob/CMakeLists.txt +++ b/modules/tracker/blob/CMakeLists.txt @@ -38,5 +38,3 @@ vp_glob_module_sources() vp_module_include_directories() vp_create_module() vp_add_tests(DEPENDS_ON visp_visual_features visp_gui visp_io) - -vp_set_source_file_compile_flag(src/dots/vpDot2.cpp -Wno-strict-overflow) diff --git a/modules/tracker/klt/CMakeLists.txt b/modules/tracker/klt/CMakeLists.txt index b7893a5f3f..f001ed5962 100644 --- a/modules/tracker/klt/CMakeLists.txt +++ b/modules/tracker/klt/CMakeLists.txt @@ -149,9 +149,3 @@ vp_glob_module_sources() vp_module_include_directories(${opt_incs}) vp_create_module(${opt_libs}) vp_add_tests() - -vp_set_source_file_compile_flag(src/vpKltOpencv.cpp -Wno-strict-overflow) - -if(USE_OPENCV) - vp_set_source_file_compile_flag(src/vpKltOpencv.cpp -Wno-float-equal) -endif() diff --git a/modules/tracker/mbt/CMakeLists.txt b/modules/tracker/mbt/CMakeLists.txt index 9b87e7c378..55c643170f 100644 --- a/modules/tracker/mbt/CMakeLists.txt +++ b/modules/tracker/mbt/CMakeLists.txt @@ -35,6 +35,7 @@ # Add optional 3rd parties set(opt_incs "") +set(opt_system_incs "") set(opt_libs "") set(opt_libs_private "") @@ -145,29 +146,6 @@ endif() vp_add_module(mbt visp_vision visp_core visp_me visp_visual_features OPTIONAL visp_ar visp_klt visp_gui PRIVATE_OPTIONAL ${opt_libs_private} WRAP java) vp_glob_module_sources() -if(USE_OGRE) - # Add specific build flag to turn off warnings coming from libogre and libois 3rd party - vp_set_source_file_compile_flag(src/edge/vpMbEdgeTracker.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-deprecated-declarations -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(src/edge/vpMbtDistanceCircle.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(src/edge/vpMbtDistanceCylinder.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(src/edge/vpMbtDistanceLine.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(src/hybrid/vpMbEdgeKltTracker.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(src/klt/vpMbKltTracker.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-strict-overflow -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(src/klt/vpMbtDistanceKltCylinder.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(src/klt/vpMbtDistanceKltPoints.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(src/vpMbTracker.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-strict-overflow -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(src/depth/vpMbtFaceDepthDense.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(src/depth/vpMbtFaceDepthNormal.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-deprecated-declarations -Wno-float-equal -Wno-deprecated-copy -Wno-shadow -Wno-register) - vp_set_source_file_compile_flag(src/depth/vpMbDepthDenseTracker.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(src/depth/vpMbDepthNormalTracker.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(src/vpMbtXmlGenericParser.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(src/vpMbGenericTracker.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) -else() - vp_set_source_file_compile_flag(src/vpMbTracker.cpp -Wno-strict-overflow) - vp_set_source_file_compile_flag(src/klt/vpMbKltTracker.cpp -Wno-strict-overflow) - vp_set_source_file_compile_flag(src/edge/vpMbEdgeTracker.cpp -Wno-deprecated-declarations) - vp_set_source_file_compile_flag(src/depth/vpMbtFaceDepthNormal.cpp -Wno-deprecated-declarations -Wno-shadow -Wno-deprecated-copy) -endif() if(MSVC) if(BUILD_SHARED_LIBS) vp_set_source_file_compile_flag(src/depth/vpMbtTukeyEstimator.cpp /wd4244) @@ -183,18 +161,6 @@ endif() vp_module_include_directories(${opt_incs}) vp_create_module(${opt_libs}) -if(BUILD_TESTS) - if(USE_OGRE) - vp_set_source_file_compile_flag(test/generic-with-dataset/perfGenericTracker.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(test/generic-with-dataset/testGenericTracker.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(test/generic-with-dataset/testGenericTrackerCAOParsing.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(test/generic-with-dataset/testGenericTrackerDepth.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(test/generic-with-dataset/testGenericTrackerDeterminist.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(test/generic-with-dataset/testMbtXmlGenericParser.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(test/generic-with-dataset/testMbtJsonSettings.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - endif() -endif() - vp_add_tests(DEPENDS_ON visp_core visp_gui visp_io) if(VISP_DATASET_FOUND) diff --git a/modules/tracker/me/CMakeLists.txt b/modules/tracker/me/CMakeLists.txt index 282745524a..aa254e19fb 100644 --- a/modules/tracker/me/CMakeLists.txt +++ b/modules/tracker/me/CMakeLists.txt @@ -39,14 +39,7 @@ vp_module_include_directories() vp_create_module() vp_add_tests(DEPENDS_ON visp_io visp_gui) -vp_set_source_file_compile_flag(src/moving-edges/vpMeSite.cpp -Wno-strict-overflow) - -if(USE_OPENCV) - vp_set_source_file_compile_flag(src/moving-edges/vpMeNurbs.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(test/testNurbs.cpp -Wno-float-equal) -endif() - if(WITH_CATCH2) # catch2 is private include_directories(${CATCH2_INCLUDE_DIRS}) -endif() \ No newline at end of file +endif() diff --git a/modules/tracker/tt/CMakeLists.txt b/modules/tracker/tt/CMakeLists.txt index 7d6792ffd4..3cf492d48a 100644 --- a/modules/tracker/tt/CMakeLists.txt +++ b/modules/tracker/tt/CMakeLists.txt @@ -37,7 +37,3 @@ vp_add_module(tt visp_vision visp_core) vp_glob_module_sources() vp_module_include_directories() vp_create_module() - -vp_set_source_file_compile_flag(src/vpTemplateTracker.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/warp/vpTemplateTrackerWarp.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/warp/vpTemplateTrackerWarpHomographySL3.cpp -Wno-strict-overflow) diff --git a/modules/tracker/tt_mi/CMakeLists.txt b/modules/tracker/tt_mi/CMakeLists.txt index d43c03efdc..048db737ac 100644 --- a/modules/tracker/tt_mi/CMakeLists.txt +++ b/modules/tracker/tt_mi/CMakeLists.txt @@ -35,9 +35,6 @@ vp_define_module(tt_mi visp_tt) -vp_set_source_file_compile_flag(src/mi/vpTemplateTrackerMIInverseCompositional.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/tools/vpTemplateTrackerMIBSpline.cpp -Wno-strict-overflow) - # The previous line is similar to the following: #vp_add_module(tt_mi visp_tt) #vp_glob_module_sources() diff --git a/modules/vision/CMakeLists.txt b/modules/vision/CMakeLists.txt index b2a93126ab..7538843b83 100644 --- a/modules/vision/CMakeLists.txt +++ b/modules/vision/CMakeLists.txt @@ -159,17 +159,6 @@ vp_module_include_directories(${opt_incs}) vp_create_module(${opt_libs}) vp_add_tests(DEPENDS_ON visp_mbt visp_gui visp_io) -if(USE_OGRE) - # Add specific build flag to turn off warnings coming from libogre and libois 3rd party - vp_set_source_file_compile_flag(test/keypoint-with-dataset/testKeyPoint-2.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) - vp_set_source_file_compile_flag(test/keypoint-with-dataset/testKeyPoint-4.cpp -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-overloaded-virtual -Wno-float-equal -Wno-deprecated-copy -Wno-register) -endif() - -vp_set_source_file_compile_flag(src/pose-estimation/vpPoseFeatures.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/pose-estimation/vpPoseRansac.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/pose-estimation/private/vpLevenbergMarquartd.cpp -Wno-strict-overflow) -vp_set_source_file_compile_flag(src/keypoint/vpKeyPoint.cpp -Wno-strict-overflow) - if(BUILD_MODULE_visp_mbt AND BUILD_MODULE_visp_gui AND BUILD_MODULE_visp_io) if(VISP_DATASET_FOUND) add_test(testKeyPoint-2-multithreaded testKeyPoint-2 -c ${OPTION_TO_DESACTIVE_DISPLAY} -p) diff --git a/modules/visual_features/CMakeLists.txt b/modules/visual_features/CMakeLists.txt index 0789619ec8..a878b3765a 100644 --- a/modules/visual_features/CMakeLists.txt +++ b/modules/visual_features/CMakeLists.txt @@ -43,12 +43,3 @@ if(WITH_CATCH2) # catch2 is private include_directories(${CATCH2_INCLUDE_DIRS}) endif() - -if(USE_OPENCV) - vp_set_source_file_compile_flag(src/feature-builder/vpFeatureBuilderEllipse.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/feature-builder/vpFeatureBuilderLine.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/feature-builder/vpFeatureBuilderPoint.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/feature-builder/vpFeatureBuilderPoint3D.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/feature-builder/vpFeatureBuilderPointPolar.cpp -Wno-float-equal) - vp_set_source_file_compile_flag(src/feature-builder/vpFeatureBuilderSegment.cpp -Wno-float-equal) -endif() diff --git a/tutorial/gui/pcl-visualizer/CMakeLists.txt b/tutorial/gui/pcl-visualizer/CMakeLists.txt index 088dcaf465..de775cc076 100644 --- a/tutorial/gui/pcl-visualizer/CMakeLists.txt +++ b/tutorial/gui/pcl-visualizer/CMakeLists.txt @@ -15,8 +15,3 @@ foreach(cpp ${tutorial_cpp}) visp_add_dependency(${cpp} "tutorials") endif() endforeach() - -if(VISP_HAVE_PCL) -vp_set_source_file_compile_flag(tutorial-pcl-viewer.cpp -Wno-unused-parameter) -vp_set_source_file_compile_flag(ClassUsingPclViewer.cpp -Wno-unused-parameter) -endif()