Merge pull request #309 from dpaulat/feature/conan-2

Conan 2

.github/workflows/ci.yml

@@ -33,12 +33,8 @@ jobs:
             qt_arch_dir: msvc2022_64
             qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
             qt_tools: ''
-            conan_arch: x86_64
-            conan_compiler: Visual Studio
-            conan_compiler_version: 17
-            conan_compiler_runtime: --settings compiler.runtime=MD
-            conan_compiler_libcxx: ''
             conan_package_manager: ''
+            conan_profile: scwx-win64_msvc2022
             artifact_suffix: windows-x64
           - name: linux64_gcc
             os: ubuntu-22.04
@@ -51,12 +47,8 @@ jobs:
             qt_arch_dir: gcc_64
             qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
             qt_tools: ''
-            conan_arch: x86_64
-            conan_compiler: gcc
-            conan_compiler_version: 11
-            conan_compiler_libcxx: --settings compiler.libcxx=libstdc++
-            conan_compiler_runtime: ''
             conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True
+            conan_profile: scwx-linux_gcc-11
             artifact_suffix: linux-x64
             compiler_packages: ''
           - name: linux64_clang
@@ -70,12 +62,8 @@ jobs:
             qt_arch_dir: gcc_64
             qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
             qt_tools: ''
-            conan_arch: x86_64
-            conan_compiler: clang
-            conan_compiler_version: 17
-            conan_compiler_libcxx: --settings compiler.libcxx=libstdc++11
-            conan_compiler_runtime: ''
             conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True
+            conan_profile: scwx-linux_clang-17
             artifact_suffix: linux-clang-x64
             compiler_packages: clang-17
     name: ${{ matrix.name }}
@@ -128,28 +116,33 @@ jobs:
     - name: Install Conan Packages
       shell: pwsh
       run: |
-        pip install "conan<2.0"
+        pip install conan
-        conan profile new default --detect
+        conan profile detect -e
-        conan install ./source/ `
+        conan config install `
+          ./source/tools/conan/profiles/${{ matrix.conan_profile }} `
+          -tf profiles
+        mkdir build
+        cd build
+        mkdir conan
+        conan install ../source/ `
           --remote conancenter `
           --build missing `
-          --settings arch=${{ matrix.conan_arch }} `
+          --profile:all ${{ matrix.conan_profile }} `
-          --settings build_type=${{ matrix.build_type }} `
+          --settings:all build_type=${{ matrix.build_type }} `
-          --settings compiler="${{ matrix.conan_compiler }}" `
+          --output-folder ./conan/ `
-          --settings compiler.version=${{ matrix.conan_compiler_version }} `
-          ${{ matrix.conan_compiler_libcxx }} `
-          ${{ matrix.conan_compiler_runtime }} `
           ${{ matrix.conan_package_manager }}
 
     - name: Build Supercell Wx
       shell: pwsh
       run: |
-        mkdir build
         cd build
         cmake ../source/ `
           -G Ninja `
           -DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" `
-          -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/supercell-wx"
+          -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES="${{ github.workspace }}/source/external/cmake-conan/conan_provider.cmake" `
+          -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/supercell-wx" `
+          -DCONAN_HOST_PROFILE="${{ matrix.conan_profile }}" `
+          -DCONAN_BUILD_PROFILE="${{ matrix.conan_profile }}"
         ninja supercell-wx wxtest
 
     - name: Separate Debug Symbols (Linux)
@@ -157,6 +150,7 @@ jobs:
       shell: bash
       run: |
         cd build/
+        cd Release/
         cd bin/
         objcopy --only-keep-debug supercell-wx supercell-wx.debug
         objcopy --strip-debug --strip-unneeded supercell-wx
@@ -201,7 +195,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: supercell-wx-debug-${{ matrix.artifact_suffix }}
-        path: ${{ github.workspace }}/build/bin/*.pdb
+        path: ${{ github.workspace }}/build/Release/bin/*.pdb
 
     - name: Upload Artifacts (Linux)
       if: ${{ startsWith(matrix.os, 'ubuntu') }}
@@ -216,8 +210,8 @@ jobs:
       with:
         name: supercell-wx-debug-${{ matrix.artifact_suffix }}
         path: |
-          ${{ github.workspace }}/build/bin/*.debug
+          ${{ github.workspace }}/build/Release/bin/*.debug
-          ${{ github.workspace }}/build/lib/*.debug
+          ${{ github.workspace }}/build/Release/lib/*.debug
 
     - name: Build Installer (Windows)
       if: matrix.os == 'windows-2022'

.github/workflows/clang-tidy-review.yml

@@ -24,12 +24,8 @@ jobs:
             qt_arch_aqt: linux_gcc_64
             qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
             qt_tools: ''
-            conan_arch: x86_64
-            conan_compiler: clang
-            conan_compiler_version: 17
-            conan_compiler_libcxx: --settings compiler.libcxx=libstdc++11
-            conan_compiler_runtime: ''
             conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True
+            conan_profile: scwx-linux_clang-17
             compiler_packages: clang-17 clang-tidy-17
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
@@ -78,28 +74,33 @@ jobs:
     - name: Install Conan Packages
       shell: pwsh
       run: |
-        pip install "conan<2.0"
+        pip install conan
-        conan profile new default --detect
+        conan profile detect -e
-        conan install ./source/ `
+        conan config install `
+          ./source/tools/conan/profiles/${{ matrix.conan_profile }} `
+          -tf profiles
+        mkdir build
+        cd build
+        mkdir conan
+        conan install ../source/ `
           --remote conancenter `
           --build missing `
-          --settings arch=${{ matrix.conan_arch }} `
+          --profile:all ${{ matrix.conan_profile }} `
-          --settings build_type=${{ matrix.build_type }} `
+          --settings:all build_type=${{ matrix.build_type }} `
-          --settings compiler="${{ matrix.conan_compiler }}" `
+          --output-folder ./conan/ `
-          --settings compiler.version=${{ matrix.conan_compiler_version }} `
-          ${{ matrix.conan_compiler_libcxx }} `
-          ${{ matrix.conan_compiler_runtime }} `
           ${{ matrix.conan_package_manager }}
 
     - name: Autogenerate
       shell: pwsh
       run: |
-        mkdir build
         cd build
         cmake ../source/ `
           -G Ninja `
           -DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" `
+          -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES="${{ github.workspace }}/source/external/cmake-conan/conan_provider.cmake" `
           -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/supercell-wx" `
+          -DCONAN_HOST_PROFILE="${{ matrix.conan_profile }}" `
+          -DCONAN_BUILD_PROFILE="${{ matrix.conan_profile }}" `
           -DCMAKE_EXPORT_COMPILE_COMMANDS=on
         ninja scwx-qt_generate_counties_db `
               scwx-qt_generate_versions `

.gitignore

@@ -5,6 +5,7 @@ CMakeLists.txt.user
 CMakeCache.txt
 CMakeFiles
 CMakeScripts
+CMakeUserPresets.json
 Testing
 cmake_install.cmake
 install_manifest.txt

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.24)
 set(PROJECT_NAME supercell-wx)
 project(${PROJECT_NAME}
         VERSION      0.4.7
@@ -11,36 +11,19 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 set(CMAKE_POLICY_DEFAULT_CMP0079 NEW)
 set(CMAKE_POLICY_DEFAULT_CMP0148 OLD) # aws-sdk-cpp uses FindPythonInterp
 
+include(tools/scwx_config.cmake)
+
+scwx_output_dirs_setup()
+
 enable_testing()
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 
-include(${PROJECT_SOURCE_DIR}/external/cmake-conan/conan.cmake)
-
 set_property(DIRECTORY
              APPEND
              PROPERTY CMAKE_CONFIGURE_DEPENDS
              conanfile.py)
 
-# Don't use RelWithDebInfo Conan packages
-if (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
-    set(conan_build_type "Release")
-else()
-    set(conan_build_type ${CMAKE_BUILD_TYPE})
-endif()
-
-conan_cmake_autodetect(settings
-                       BUILD_TYPE ${conan_build_type})
-
-conan_cmake_install(PATH_OR_REFERENCE ${PROJECT_SOURCE_DIR}
-                    BUILD missing
-                    REMOTE conancenter
-                    SETTINGS ${settings})
-
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
-conan_basic_setup(TARGETS)
-
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_ALL_NO_LIB")
 
 set(SCWX_DIR ${PROJECT_SOURCE_DIR})

conanfile.py

@@ -1,17 +1,21 @@
-from conans import ConanFile
+from conan import ConanFile
+from conan.tools.cmake import CMake
+from conan.tools.files import copy
+import os
 
 class SupercellWxConan(ConanFile):
     settings   = ("os", "compiler", "build_type", "arch")
     requires   = ("boost/1.86.0",
                   "cpr/1.11.0",
                   "fontconfig/2.15.0",
-                  "freetype/2.13.3",
+                  "freetype/2.13.2",
                   "geographiclib/2.4",
                   "geos/3.13.0",
                   "glew/2.2.0",
                   "glm/cci.20230113",
                   "gtest/1.15.0",
                   "libcurl/8.10.1",
+                  "libpng/1.6.44",
                   "libxml2/2.12.7",
                   "openssl/3.3.2",
                   "re2/20240702",
@@ -19,19 +23,33 @@ class SupercellWxConan(ConanFile):
                   "sqlite3/3.46.1",
                   "vulkan-loader/1.3.243.0",
                   "zlib/1.3.1")
-    generators = ("cmake",
+    generators = ("CMakeDeps")
-                  "cmake_find_package",
+    default_options = {"geos/*:shared"      : True,
-                  "cmake_paths")
+                       "libiconv/*:shared"  : True,
-    default_options = {"geos:shared"      : True,
+                       "openssl/*:no_module": True,
-                       "libiconv:shared"  : True,
+                       "openssl/*:shared"   : True}
-                       "openssl:no_module": True,
-                       "openssl:shared"   : True}
 
     def requirements(self):
         if self.settings.os == "Linux":
             self.requires("onetbb/2021.12.0")
 
-    def imports(self):
+    def generate(self):
-        self.copy("*.dll", dst="bin", src="bin")
+        build_folder = os.path.join(self.build_folder,
-        self.copy("*.dylib", dst="bin", src="lib")
+                                    "..",
-        self.copy("license*", dst="licenses", src=".", folder=True, ignore_case=True)
+                                    str(self.settings.build_type),
+                                    self.cpp_info.bindirs[0])
+
+        for dep in self.dependencies.values():
+            if dep.cpp_info.bindirs:
+                copy(self, "*.dll", dep.cpp_info.bindirs[0], build_folder)
+            if dep.cpp_info.libdirs:
+                copy(self, "*.dylib", dep.cpp_info.libdirs[0], build_folder)
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def package(self):
+        cmake = CMake(self)
+        cmake.install()

external/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 set(PROJECT_NAME scwx-external)
 
 set_property(DIRECTORY

external/aws-sdk-cpp

@@ -1 +1 @@
-Subproject commit d5eb42fe7c632868d4535b454ee2e5ba0e349b7f
+Subproject commit c95e71a9d23bba0c2f6c6a7bc37ae63b7351e8b7

external/aws-sdk-cpp.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 set(PROJECT_NAME scwx-aws-sdk-cpp)
 
 set(AWS_SDK_WARNINGS_ARE_ERRORS OFF)
@@ -21,6 +21,10 @@ set(MINIMIZE_SIZE      OFF  CACHE BOOL   "If enabled, the SDK will be built via
 # Save off ${CMAKE_CXX_FLAGS} before modifying compiler settings
 set(CMAKE_CXX_FLAGS_PREV "${CMAKE_CXX_FLAGS}")
 
+# Configure OpenSSL crypto library
+find_package(OpenSSL)
+add_library(crypto ALIAS OpenSSL::Crypto)
+
 # Fix CMake errors for internal variables not set
 include(aws-sdk-cpp/cmake/compiler_settings.cmake)
 set_msvc_warnings()

external/cmake-conan

@@ -1 +1 @@
-Subproject commit b240c809b5ea097077fc8222cad71d2329288e48
+Subproject commit c22bbf0af0b73d5f0def24a9cdf4ce503ae79e5d

external/date.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 set(PROJECT_NAME scwx-date)
 
 set(USE_SYSTEM_TZ_DB ON)

external/hsluv-c.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 set(PROJECT_NAME scwx-hsluv-c)
 
 set(HSLUV_C_TESTS OFF)

external/imgui.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 set(PROJECT_NAME scwx-imgui)
 
 find_package(QT NAMES Qt6

external/maplibre-native-qt.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 set(PROJECT_NAME scwx-mln)
 
 set(gtest_disable_pthreads ON)

external/stb.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 set(PROJECT_NAME scwx-stb)
 
 set(STB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/stb PARENT_SCOPE)

external/textflowcpp.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 set(PROJECT_NAME scwx-textflowcpp)
 
 set(TEXTFLOWCPP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/textflowcpp PARENT_SCOPE)

external/units.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 set(PROJECT_NAME scwx-units)
 
 add_subdirectory(units)

scwx-qt/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.24)
 
 set_property(DIRECTORY
              APPEND

scwx-qt/scwx-qt.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.24)
 
 project(scwx-qt LANGUAGES CXX)
 

setup-debug.bat

@@ -2,12 +2,24 @@ call tools\setup-common.bat
 
 set build_dir=build-debug
 set build_type=Debug
+set conan_profile=scwx-win64_msvc2022
 set qt_version=6.8.0
 set qt_arch=msvc2022_64
 
+conan config install tools/conan/profiles/%conan_profile% -tf profiles
+conan install . ^
+    --remote conancenter ^
+    --build missing ^
+    --profile:all %conan_profile% ^
+    --settings:all build_type=%build_type% ^
+    --output-folder %build_dir%/conan
+
 mkdir %build_dir%
 cmake -B %build_dir% -S . ^
     -DCMAKE_BUILD_TYPE=%build_type% ^
     -DCMAKE_CONFIGURATION_TYPES=%build_type% ^
-    -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/%qt_arch%
+    -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/%qt_arch% ^
+    -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=external/cmake-conan/conan_provider.cmake ^
+    -DCONAN_HOST_PROFILE=%conan_profile% ^
+    -DCONAN_BUILD_PROFILE=%conan_profile%
 pause

setup-debug.sh

@@ -3,14 +3,26 @@
 
 build_dir=${1:-build-debug}
 build_type=Debug
+conan_profile=${2:-scwx-linux_gcc-11}
 qt_version=6.8.0
 qt_arch=gcc_64
 script_dir="$(dirname "$(readlink -f "$0")")"
 
+conan config install tools/conan/profiles/${conan_profile} -tf profiles
+conan install . \
+    --remote conancenter \
+    --build missing \
+    --profile:all ${conan_profile} \
+    --settings:all build_type=${build_type} \
+    --output-folder ${build_dir}/conan
+
 mkdir -p ${build_dir}
 cmake -B ${build_dir} -S . \
 	-DCMAKE_BUILD_TYPE=${build_type} \
 	-DCMAKE_CONFIGURATION_TYPES=${build_type} \
 	-DCMAKE_INSTALL_PREFIX=${build_dir}/${build_type}/supercell-wx \
 	-DCMAKE_PREFIX_PATH=/opt/Qt/${qt_version}/${qt_arch} \
+	-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=${script_dir}/external/cmake-conan/conan_provider.cmake \
+	-DCONAN_HOST_PROFILE=${conan_profile} \
+	-DCONAN_BUILD_PROFILE=${conan_profile} \
 	-G Ninja

setup-multi.bat

@@ -0,0 +1,28 @@
+call tools\setup-common.bat
+
+set build_dir=build
+set conan_profile=scwx-win64_msvc2022
+set qt_version=6.8.0
+set qt_arch=msvc2022_64
+
+conan config install tools/conan/profiles/%conan_profile% -tf profiles
+conan install . ^
+    --remote conancenter ^
+    --build missing ^
+    --profile:all %conan_profile% ^
+    --settings:all build_type=Debug ^
+    --output-folder %build_dir%/conan
+conan install . ^
+    --remote conancenter ^
+    --build missing ^
+    --profile:all %conan_profile% ^
+    --settings:all build_type=Release ^
+    --output-folder %build_dir%/conan
+
+mkdir %build_dir%
+cmake -B %build_dir% -S . ^
+    -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/%qt_arch% ^
+    -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=external/cmake-conan/conan_provider.cmake ^
+    -DCONAN_HOST_PROFILE=%conan_profile% ^
+    -DCONAN_BUILD_PROFILE=%conan_profile%
+pause

setup-release.bat

@@ -2,12 +2,24 @@ call tools\setup-common.bat
 
 set build_dir=build-release
 set build_type=Release
+set conan_profile=scwx-win64_msvc2022
 set qt_version=6.8.0
 set qt_arch=msvc2022_64
 
+conan config install tools/conan/profiles/%conan_profile% -tf profiles
+conan install . ^
+    --remote conancenter ^
+    --build missing ^
+    --profile:all %conan_profile% ^
+    --settings:all build_type=%build_type% ^
+    --output-folder %build_dir%/conan
+
 mkdir %build_dir%
 cmake -B %build_dir% -S . ^
     -DCMAKE_BUILD_TYPE=%build_type% ^
     -DCMAKE_CONFIGURATION_TYPES=%build_type% ^
-    -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/%qt_arch%
+    -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/%qt_arch% ^
+    -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=external/cmake-conan/conan_provider.cmake ^
+    -DCONAN_HOST_PROFILE=%conan_profile% ^
+    -DCONAN_BUILD_PROFILE=%conan_profile%
 pause

setup-release.sh

@@ -3,14 +3,26 @@
 
 build_dir=${1:-build-release}
 build_type=Release
+conan_profile=${2:-scwx-linux_gcc-11}
 qt_version=6.8.0
 qt_arch=gcc_64
 script_dir="$(dirname "$(readlink -f "$0")")"
 
+conan config install tools/conan/profiles/${conan_profile} -tf profiles
+conan install . \
+    --remote conancenter \
+    --build missing \
+    --profile:all ${conan_profile} \
+    --settings:all build_type=${build_type} \
+    --output-folder ${build_dir}/conan
+
 mkdir -p ${build_dir}
 cmake -B ${build_dir} -S . \
 	-DCMAKE_BUILD_TYPE=${build_type} \
 	-DCMAKE_CONFIGURATION_TYPES=${build_type} \
 	-DCMAKE_INSTALL_PREFIX=${build_dir}/${build_type}/supercell-wx \
 	-DCMAKE_PREFIX_PATH=/opt/Qt/${qt_version}/${qt_arch} \
+	-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=${script_dir}/external/cmake-conan/conan_provider.cmake \
+	-DCONAN_HOST_PROFILE=${conan_profile} \
+	-DCONAN_BUILD_PROFILE=${conan_profile} \
 	-G Ninja

test/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 
 set_property(DIRECTORY
              APPEND

test/test.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(scwx-test CXX)
 
 include(GoogleTest)

tools/conan/profiles/scwx-linux_clang-17

@@ -0,0 +1,8 @@
+[settings]
+arch=x86_64
+build_type=Release
+compiler=clang
+compiler.cppstd=20
+compiler.libcxx=libstdc++11
+compiler.version=17
+os=Linux

tools/conan/profiles/scwx-linux_gcc-11

@@ -0,0 +1,8 @@
+[settings]
+arch=x86_64
+build_type=Release
+compiler=gcc
+compiler.cppstd=20
+compiler.libcxx=libstdc++11
+compiler.version=11
+os=Linux

tools/conan/profiles/scwx-linux_gcc-12

@@ -0,0 +1,8 @@
+[settings]
+arch=x86_64
+build_type=Release
+compiler=gcc
+compiler.cppstd=20
+compiler.libcxx=libstdc++11
+compiler.version=12
+os=Linux

tools/conan/profiles/scwx-linux_gcc-13

@@ -0,0 +1,8 @@
+[settings]
+arch=x86_64
+build_type=Release
+compiler=gcc
+compiler.cppstd=20
+compiler.libcxx=libstdc++11
+compiler.version=13
+os=Linux

tools/conan/profiles/scwx-linux_gcc-14

@@ -0,0 +1,8 @@
+[settings]
+arch=x86_64
+build_type=Release
+compiler=gcc
+compiler.cppstd=20
+compiler.libcxx=libstdc++11
+compiler.version=14
+os=Linux

tools/conan/profiles/scwx-win64_msvc2022

@@ -0,0 +1,8 @@
+[settings]
+arch=x86_64
+build_type=Release
+compiler=msvc
+compiler.cppstd=20
+compiler.runtime=dynamic
+compiler.version=194
+os=Windows

tools/scwx_config.cmake

@@ -0,0 +1,19 @@
+macro(scwx_output_dirs_setup)
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}/Release/bin)
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/bin)
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_CURRENT_BINARY_DIR}/MinSizeRel/bin)
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/Debug/bin)
+
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}/Release/lib)
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/lib)
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_CURRENT_BINARY_DIR}/MinSizeRel/lib)
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/Debug/lib)
+
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}/Release/lib)
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/lib)
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_CURRENT_BINARY_DIR}/MinSizeRel/lib)
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/Debug/lib)
+endmacro()

tools/setup-common.bat

@@ -1,4 +1,4 @@
-pip install --upgrade "conan<2.0"
+pip install --upgrade conan
 pip install --upgrade geopandas
 pip install --upgrade GitPython
-conan profile new default --detect
+conan profile detect -e

tools/setup-common.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-pip install --upgrade --user "conan<2.0"
+pip install --upgrade --user conan
 pip install --upgrade --user geopandas
 pip install --upgrade --user GitPython
-conan profile new default --detect
+conan profile detect -e

wxdata/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 
 set_property(DIRECTORY
              APPEND

wxdata/wxdata.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 
 project(scwx-data)