From 47fb1c9954ad0795a64bcb7a8a6115c2de5416a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Gon=C3=A7alves?= Date: Mon, 4 Jul 2022 17:52:20 +0100 Subject: [PATCH 1/5] CMakeList: change minimum version required to 3.12. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cb88b284f..33c39f621c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ ############################################################################ # Validate CMake version. -cmake_minimum_required(VERSION 3.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) if(COMMAND CMAKE_POLICY) cmake_policy(SET CMP0003 NEW) From 2173540248f4e561b6970ac4b5ad3bf3e338abdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Gon=C3=A7alves?= Date: Mon, 4 Jul 2022 17:53:11 +0100 Subject: [PATCH 2/5] Cmake: Architecture: add armv8 (aarch64) --- cmake/Architecture.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/Architecture.cmake b/cmake/Architecture.cmake index b9cc38edbd..c5833cdfb1 100644 --- a/cmake/Architecture.cmake +++ b/cmake/Architecture.cmake @@ -43,9 +43,13 @@ macro(dune_test_cpu cpu bits endianess macro header) if(${output}) check_cxx_source_compiles("#if defined(__arch64__)\n#else\n#error not defined\n#endif\nint main(void) {return 0; }\n" __ARCH64__) + check_cxx_source_compiles("#if defined(__aarch64__)\n#else\n#error not defined\n#endif\nint main(void) {return 0; }\n" __AARCH64__) if(__ARCH64__) set(gbits 64) endif(__ARCH64__) + if(__AARCH64__) + set(gbits 64) + endif(__AARCH64__) set(DUNE_CPU 1) set(DUNE_CPU_${ucpu} 1) @@ -91,6 +95,7 @@ macro(dune_probe_cpu) dune_test_cpu(ARMv4 32 unknown __ARM_ARCH_4T__ cstdio) dune_test_cpu(ARMv5 32 unknown __ARM_ARCH_5T__ cstdio) dune_test_cpu(ARMv7 32 unknown __ARM_ARCH_7A__ cstdio) + dune_test_cpu(ARMv8 64 little __aarch64__ cstdio) dune_test_cpu(ARM 32 unknown __arm__ cstdio) dune_test_cpu(SPARC 32 big __sparc__ cstdio) dune_test_cpu(SPARCv9 64 big __sparcv9 cstdio) From bb4a8734b2c06e94bda80892fe4b78f49175b204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Gon=C3=A7alves?= Date: Mon, 4 Jul 2022 17:53:52 +0100 Subject: [PATCH 3/5] Cmake: Libraries: update rules for exiv2, opencv and pointgrey. --- cmake/Libraries/Exiv2.cmake | 4 ++-- cmake/Libraries/OpenCV.cmake | 29 ++++++++++++----------------- cmake/Libraries/PointGrey.cmake | 19 +++++++------------ 3 files changed, 21 insertions(+), 31 deletions(-) diff --git a/cmake/Libraries/Exiv2.cmake b/cmake/Libraries/Exiv2.cmake index c67bcad7a1..4b2e79113b 100644 --- a/cmake/Libraries/Exiv2.cmake +++ b/cmake/Libraries/Exiv2.cmake @@ -27,8 +27,8 @@ if(EXIV2) find_library(EXIV2_LIBRARY NAMES exiv2 PATHS /usr/lib) - - if(${EXIV2_LIBRARY} STRLESS "libexiv2.so") + if(${EXIV2_LIBRARY} MATCHES "libexiv2.so") + message(STATUS "Found Exiv2 library: ${EXIV2_LIBRARY}") # Exiv2 Present set(DUNE_SYS_HAS_EXIV2 1 CACHE INTERNAL "Exiv2 library") set(DUNE_USING_EXIV2 1 CACHE INTERNAL "Exiv2 library") diff --git a/cmake/Libraries/OpenCV.cmake b/cmake/Libraries/OpenCV.cmake index 605a036279..4d179a6071 100644 --- a/cmake/Libraries/OpenCV.cmake +++ b/cmake/Libraries/OpenCV.cmake @@ -28,14 +28,15 @@ ############################################################################ if(OPENCV) - CHECK_LIBRARY_EXISTS(opencv_core cvGetImage "" HAVE_LIB_OPENCV) + #find_package(OpenCV4 REQUIRED) + find_library(OPENCV_LIBRARY NAMES opencv_core PATHS /usr/lib) + if(${OPENCV_LIBRARY} MATCHES "libopencv_core.so") + # OPENCV Present + message(STATUS "Found Opencv library: ${OPENCV_LIBRARY}") + set(DUNE_SYS_HAS_OPENCV 1 CACHE INTERNAL "Opencv library") + set(DUNE_USING_OPENCV 1 CACHE INTERNAL "Opencv library") - if(HAVE_LIB_OPENCV) - # OpenCV Present - set(DUNE_SYS_HAS_OPENCV 1 CACHE INTERNAL "OpenCV library") - set(DUNE_USING_OPENCV 1 CACHE INTERNAL "OpenCV library") - - # FIND_PACKAGE(OpenCV REQUIRED) + # FIND_PACKAGE(OpenCV REQUIRED) dune_add_lib(opencv_calib3d) dune_add_lib(opencv_core) dune_add_lib(opencv_features2d) @@ -54,19 +55,13 @@ if(OPENCV) #dune_add_lib(opencv_contrib) #dune_add_lib(opencv_gpu) #dune_add_lib(opencv_legacy) + dune_add_lib(opencv_imgcodecs) - # Check Header - dune_test_header(opencv2/opencv.hpp) - - dune_test_header(opencv2/imgcodecs.hpp) - if(DUNE_SYS_HAS_OPENCV2_IMGCODECS_HPP) - dune_add_lib(opencv_imgcodecs) - endif(DUNE_SYS_HAS_OPENCV2_IMGCODECS_HPP) - - else(HAVE_LIB_OPENCV) + else() # OpenCV not found on the system. message(SEND_ERROR "OpenCV was not found on the system.") set(DUNE_SYS_HAS_OPENCV 0 CACHE INTERNAL "OpenCV library") set(DUNE_USING_OPENCV 0 CACHE INTERNAL "OpenCV library") - endif(HAVE_LIB_OPENCV) + endif() + endif(OPENCV) diff --git a/cmake/Libraries/PointGrey.cmake b/cmake/Libraries/PointGrey.cmake index 7332998d15..bcbbe4eb6b 100644 --- a/cmake/Libraries/PointGrey.cmake +++ b/cmake/Libraries/PointGrey.cmake @@ -26,26 +26,21 @@ ############################################################################ if(POINTGREY) - CHECK_LIBRARY_EXISTS(flycapture-c GetInternal "" HAVE_LIB_FLYCAPTURE) - - if(HAVE_LIB_FLYCAPTURE) - # FlyCapture Present + find_library(POINTGREY_LIBRARY NAMES flycapture PATHS /usr/lib) + if(${POINTGREY_LIBRARY} MATCHES "libflycapture.so") + message(STATUS "Found Pointgrey library: ${POINTGREY_LIBRARY}") + # Flycapture Present set(DUNE_SYS_HAS_FLYCAPTURE 1 CACHE INTERNAL "FlyCapture library") set(DUNE_USING_FLYCAPTURE 1 CACHE INTERNAL "FlyCapture library") - dune_add_lib(flycapture) dune_add_lib(flycapture-c) - # Check Header - dune_test_header(flycapture/FlyCapture2.h) - dune_test_header(flycapture/FlyCapture2_C.h) - - else(HAVE_LIB_FLYCAPTURE) - # FlyCapture not found on the system. + else() + # FlyCapture not found on the system. message(SEND_ERROR "FlyCapture was not found on the system.") set(DUNE_SYS_HAS_FLYCAPTURE 0 CACHE INTERNAL "FlyCapture library") set(DUNE_USING_FLYCAPTURE 0 CACHE INTERNAL "FlyCapture library") - endif(HAVE_LIB_FLYCAPTURE) + endif() endif(POINTGREY) From bdb2af8278a00d54547de46de757fbfd819c8a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Gon=C3=A7alves?= Date: Wed, 6 Jul 2022 14:27:31 +0100 Subject: [PATCH 4/5] Cmake: remove check for internal jpge-80. --- cmake/Libraries/JPEG.cmake | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/cmake/Libraries/JPEG.cmake b/cmake/Libraries/JPEG.cmake index 9c27ac4169..993477d745 100644 --- a/cmake/Libraries/JPEG.cmake +++ b/cmake/Libraries/JPEG.cmake @@ -30,20 +30,11 @@ CHECK_LIBRARY_EXISTS(jpeg jpeg_set_defaults "" HAVE_LIB_JPEG) dune_test_header_deps(jpeglib.h "sys/types.h;stdio.h") -check_cxx_source_compiles(" -#include -#include -#if JPEG_LIB_VERSION < 80 -# error JPEG too old -#endif -int main(void) {return 0;}" -HAVE_LIB_JPEG_80) - -if(HAVE_LIB_JPEG AND HAVE_LIB_JPEG_80 AND DUNE_SYS_HAS_JPEGLIB_H) +if(HAVE_LIB_JPEG AND DUNE_SYS_HAS_JPEGLIB_H) dune_add_lib(jpeg) set(DUNE_SYS_HAS_JPEG 1 CACHE INTERNAL "JPEG library") set(DUNE_USING_JPEG 1 CACHE INTERNAL "JPEG library") -else(HAVE_LIB_JPEG AND HAVE_LIB_JPEG_80 AND DUNE_SYS_HAS_JPEGLIB_H) +else(HAVE_LIB_JPEG AND DUNE_SYS_HAS_JPEGLIB_H) set(DUNE_SYS_HAS_JPEG 0 CACHE INTERNAL "JPEG library") set(DUNE_USING_JPEG 0 CACHE INTERNAL "JPEG library") -endif(HAVE_LIB_JPEG AND HAVE_LIB_JPEG_80 AND DUNE_SYS_HAS_JPEGLIB_H) +endif(HAVE_LIB_JPEG AND DUNE_SYS_HAS_JPEGLIB_H) From 3d30bc44837f84b8c51e04e1c8d85b51cc6db2e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Gon=C3=A7alves?= Date: Wed, 17 Jul 2024 09:47:52 +0100 Subject: [PATCH 5/5] CMakeLists: update version. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 33c39f621c..8fbd049243 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,8 +50,8 @@ set(PROJECT_SHORT_NAME "DUNE") set(PROJECT_VENDOR "Universidade do Porto - LSTS") set(PROJECT_COPYRIGHT "Copyright (C) 2007-2024 - ${PROJECT_VENDOR}") set(PROJECT_CONTACT "DUNE ") -set(PROJECT_VERSION_YEAR "2022") -set(PROJECT_VERSION_MONTH "04") +set(PROJECT_VERSION_YEAR "2024") +set(PROJECT_VERSION_MONTH "07") set(PROJECT_VERSION_PATCH "0") set(PROJECT_VERSION_RCN "0")