Qt6 port and update nanoflann

.ci/conda.yml

@@ -3,6 +3,6 @@ channels:
   - conda-forge
 dependencies:
   - ninja
-  - qt=5.15.*
-  - cgal=5.*
-  - tbb-devel=2021.*
+  - qt6-main==6.8.3
+  - cgal=6.0.*
+  - tbb-devel=2022.*

.github/workflows/build.yml

@@ -1,6 +1,6 @@
 name: Build
 
-on: [ push, pull_request ]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -16,13 +16,13 @@ jobs:
               name: "Windows MSVC",
               os: windows-latest,
               generator: "Ninja",
-              conda_library_dir: "Library"
+              conda_library_dir: "Library",
             }
           - {
-                name: "macOS Clang",
-                os: macos-latest,
-                generator: "Ninja",
-                conda_library_dir: "."
+              name: "macOS Clang",
+              os: macos-latest,
+              generator: "Ninja",
+              conda_library_dir: ".",
             }
 
     steps:
@@ -69,7 +69,7 @@ jobs:
           .
 
       - name: Configure (Windows)
-        if:  matrix.config.os == 'windows-latest'
+        if: matrix.config.os == 'windows-latest'
         shell: bash -l {0}
         run: |
           mkdir build
@@ -90,7 +90,7 @@ jobs:
 
   ubuntu-build:
     name: Ubuntu ${{ matrix.compiler }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
 
     strategy:
@@ -109,9 +109,9 @@ jobs:
           sudo apt-get update -qq
 
           sudo apt-get install -qy cmake ninja-build
-          qtbase5-dev qttools5-dev qttools5-dev-tools
+          qt6-base-dev qt6-tools-dev qt6-tools-dev-tools
           libtbb-dev
-          libcgal-dev libcgal-qt5-dev
+          libcgal-dev
 
       - name: Setup GCC
         if: matrix.compiler == 'GCC'

CMakeLists.txt

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 # Copyright © Andy Maloney <asmaloney@gmail.com>
 
-cmake_minimum_required( VERSION 3.10 )
+cmake_minimum_required( VERSION 3.15 )
 
 project( CCCoreLib
 	DESCRIPTION
@@ -102,7 +102,7 @@ add_subdirectory( src )
 # Compiler & definitions
 target_compile_features( CCCoreLib
 	PRIVATE
-		cxx_std_14
+		cxx_std_17
 )
 
 set_target_properties( CCCoreLib
@@ -116,9 +116,9 @@ target_compile_definitions( CCCoreLib
 )
 
 # Nanoflann
-option(NANOFLANN_BUILD_BENCHMARKS "" OFF)
-option(NANOFLANN_BUILD_EXAMPLES "" OFF)
-option(NANOFLANN_BUILD_TESTS "" OFF)
+set( NANOFLANN_BUILD_BENCHMARKS OFF CACHE BOOL "" FORCE )
+set( NANOFLANN_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE )
+set( NANOFLANN_BUILD_TESTS OFF CACHE BOOL "" FORCE )
 add_subdirectory( extern/nanoflann EXCLUDE_FROM_ALL )
 target_link_libraries( CCCoreLib
 	PUBLIC
@@ -186,8 +186,8 @@ if ( CCCORELIB_USE_CGAL )
 
 	if( WIN32 )
 		# Need to force the visibility of these variables so that we can use them later
-		set (GMP_LIBRARIES ${GMP_LIBRARIES} PARENT_SCOPE) 
-		set (MPFR_LIBRARIES ${MPFR_LIBRARIES} PARENT_SCOPE) 
+		set (GMP_LIBRARIES ${GMP_LIBRARIES} PARENT_SCOPE)
+		set (MPFR_LIBRARIES ${MPFR_LIBRARIES} PARENT_SCOPE)
 	endif()
 
 	if ( CCCORELIB_USE_TBB )
@@ -218,7 +218,7 @@ endif()
 
 # QT (optional)
 if ( CCCORELIB_USE_QT_CONCURRENT )
-	find_package( Qt5
+	find_package( Qt6
 		COMPONENTS
 			Concurrent
 		REQUIRED
@@ -232,7 +232,7 @@ if ( CCCORELIB_USE_QT_CONCURRENT )
 
 	target_link_libraries( CCCoreLib
 		PUBLIC
-			Qt5::Concurrent
+            Qt6::Concurrent
 	)
 
 	target_compile_definitions( CCCoreLib

cmake/CCCoreLibConfig.cmake.in

@@ -19,9 +19,9 @@ if( @CCCORELIB_USE_TBB@ )
 endif()
 if( @CCCORELIB_USE_QT_CONCURRENT@ )
   if( ${CMAKE_VERSION} VERSION_LESS "3.10.0" )
-      find_package( Qt5 COMPONENTS Concurrent )
+      find_package( Qt6 COMPONENTS Concurrent )
   else()
-      find_dependency( Qt5 COMPONENTS Concurrent )
+      find_dependency( Qt6 COMPONENTS Concurrent )
   endif()
 endif()