diff --git a/.github/update-registry.ps1 b/.github/update-registry.ps1 deleted file mode 100644 index 31cc3b8f..00000000 --- a/.github/update-registry.ps1 +++ /dev/null @@ -1,43 +0,0 @@ -#Requires -Version 7.1 - -# args -param ( - [string]$PathIn -) - -# test-path -if (!(Test-Path "$PathIn/CommonLibSF") -or !(Test-Path "$PathIn/CommonLibSF/vcpkg.json") -or !(Test-Path "$PathIn/README.md")) { - Write-Output "VCPKG_SUCCESS=false" >> $env:GITHUB_OUTPUT - exit -} - -# commit time -$version = (Get-Date -AsUTC -Format "yyyy-MM-dd") - -# update vcpkg -$vcpkg = [IO.File]::ReadAllText("$PathIn/CommonLibSF/vcpkg.json") | ConvertFrom-Json - -$currVersion = $vcpkg.'version-date' - -if($currVersion.Contains($version)) { - $version = if ($currVersion.Contains('.')) { - $identifiers = $currVersion.Split('.') - "$($identifiers[0]).$([Int32]$identifiers[1] + 1)" - } - else { - "$($currVersion).1" - } -} - -$vcpkg.'version-date' = $version -$vcpkg = $vcpkg | ConvertTo-Json -Depth 9 | ForEach-Object { $_ -replace "(?m) (?<=^(?: )*)", " " } -[IO.File]::WriteAllText("$PathIn/CommonLibSF/vcpkg.json", $vcpkg) - -# update readme -$readme = [IO.File]::ReadAllLines("$PathIn/README.md") -$readme = $readme -replace "(?<=label=vcpkg%20registry&message=).+?(?=&color)", $version -[IO.File]::WriteAllLines("$PathIn/README.md", $readme) - -# status -Write-Output "VCPKG_SUCCESS=true" >> $env:GITHUB_OUTPUT -Write-Output "VCPKG_VERSION=$version" >> $env:GITHUB_OUTPUT diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml index 15e68fac..049f1bb2 100644 --- a/.github/workflows/main_ci.yml +++ b/.github/workflows/main_ci.yml @@ -28,8 +28,8 @@ jobs: uses: TheMrMilchmann/setup-msvc-dev@v3 with: arch: x64 - toolset: 14.37 + toolset: 14.40 - name: Build run: | - ${{ github.workspace }}/scripts/build-release-${{ matrix.compiler }}-cpm-test.bat + ${{ github.workspace }}/scripts/build-release-${{ matrix.compiler }}-test.bat diff --git a/.github/workflows/main_ci_xmake.yml b/.github/workflows/main_ci_xmake.yml index f1cdbc37..14c23aa4 100644 --- a/.github/workflows/main_ci_xmake.yml +++ b/.github/workflows/main_ci_xmake.yml @@ -21,12 +21,12 @@ jobs: uses: actions/checkout@v4 - name: Setup XMake - uses: xmake-io/github-action-setup-xmake@v1.0.13 + uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: "2.8.2" + xmake-version: "latest" - name: Configure - run: xmake config -y --mode=${{ matrix.mode }} --vs_toolset=14.37 + run: xmake config -y --mode=${{ matrix.mode }} --vs_toolset=14.40 - name: Build run: xmake build -y -vD diff --git a/.github/workflows/maintenance.yml b/.github/workflows/maintenance.yml index 14dacb5a..e694f00f 100644 --- a/.github/workflows/maintenance.yml +++ b/.github/workflows/maintenance.yml @@ -24,34 +24,17 @@ jobs: run: "& ${{ github.workspace }}/.github/make-directives.ps1 ${{ github.workspace }}/CommonLibSF" - name: Run clang-format - uses: DoozyX/clang-format-lint-action@v0.16.2 + uses: DoozyX/clang-format-lint-action@v0.17 with: source: "." exclude: "./docs" extensions: "c,cc,cpp,cppm,cxx,h,hpp,hxx,inl,inc,ixx,mxx" - clangFormatVersion: 16 + clangFormatVersion: 17 inplace: True - - name: Update vcpkg port version - id: versioning - shell: pwsh - run: "& ${{ github.workspace }}/.github/update-registry.ps1 ${{ github.workspace }}" - - - name: Check failure - run: exit 1 - if: ${{ steps.versioning.outputs.VCPKG_SUCCESS == 'false' }} - - name: Add & Commit id: registry uses: EndBug/add-and-commit@v9 with: default_author: github_actions - message: "ci: maintenance `${{ steps.versioning.outputs.VCPKG_VERSION }}`" - - - name: Repository Dispatch - uses: peter-evans/repository-dispatch@v2 - with: - token: ${{ secrets.VCPKG_HELPER_TOKEN }} - repository: ${{ github.repository_owner }}/Starfield-RE-vcpkg - event-type: update-event - client-payload: '{"sha": "${{ steps.registry.outputs.commit_long_sha }}", "vcpkg-version": "${{ steps.versioning.outputs.VCPKG_VERSION }}"}' + message: "ci: maintenance" diff --git a/.github/workflows/update_pdb.yml b/.github/workflows/update_pdb.yml index 3ff0b50f..6de507ec 100644 --- a/.github/workflows/update_pdb.yml +++ b/.github/workflows/update_pdb.yml @@ -24,7 +24,7 @@ jobs: uses: TheMrMilchmann/setup-msvc-dev@v3 with: arch: x64 - toolset: 14.37 + toolset: 14.40 - name: Build run: | diff --git a/.gitignore b/.gitignore index 19da71fa..ee8888d2 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,6 @@ graph_info.json /CommonLibSF/.vs /CommonLibSF/out /vsxmake* + +.idea +*ReSharper* diff --git a/CommonLibSF/CMakeLists.txt b/CommonLibSF/CMakeLists.txt index 369622ef..0c432e22 100644 --- a/CommonLibSF/CMakeLists.txt +++ b/CommonLibSF/CMakeLists.txt @@ -33,19 +33,7 @@ if(${PROJECT_SOURCE_DIR} STREQUAL ${PROJECT_BINARY_DIR}) endif() # dependencies -if(USING_VCPKG) - find_package(spdlog CONFIG REQUIRED) -else() - include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CPM.cmake") - - set(CPM_SOURCE_CACHE "${CMAKE_CURRENT_BINARY_DIR}/.cpm") - - CPMAddPackage( - GITHUB_REPOSITORY gabime/spdlog - VERSION 1.12.0 - OPTIONS "SPDLOG_USE_STD_FORMAT ON" - ) -endif() +find_package(spdlog CONFIG REQUIRED) # source files execute_process( @@ -59,95 +47,85 @@ source_group( FILES ${SOURCES} ) -function (configure_target TARGET_NAME) +function(configure_target TARGET_NAME) target_compile_definitions( ${TARGET_NAME} PUBLIC - WINVER=0x0A00 # windows 10, minimum supported version by starfield - _WIN32_WINNT=0x0A00 - "$<$:SFSE_SUPPORT_XBYAK=1>" + WINVER=0x0A00 # windows 10, minimum supported version by starfield + _WIN32_WINNT=0x0A00 + "$<$:SFSE_SUPPORT_XBYAK=1>" ) # FIXME: https://gitlab.kitware.com/cmake/cmake/-/issues/24922 set_property( TARGET ${TARGET_NAME} PROPERTY VS_USER_PROPS - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/build_stl_modules.props" + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/build_stl_modules.props" ) if(MSVC) target_compile_options( ${TARGET_NAME} PUBLIC - /bigobj # support large object file format - /utf-8 # assume UTF-8 sources even without a BOM + /bigobj # support large object file format + /utf-8 # assume UTF-8 sources even without a BOM # warnings -> errors - /we4715 # 'function' : not all control paths return a value + /we4715 # 'function' : not all control paths return a value # disable warnings - /wd4005 # macro redefinition - /wd4061 # enumerator 'identifier' in switch of enum 'enumeration' is not explicitly handled by a case label - /wd4068 # unknown pragma - /wd4200 # nonstandard extension used : zero-sized array in struct/union - /wd4201 # nonstandard extension used : nameless struct/union - /wd4265 # 'type': class has virtual functions, but its non-trivial destructor is not virtual; instances of this class may not be destructed correctly - /wd4266 # 'function' : no override available for virtual member function from base 'type'; function is hidden - /wd4267 # 'var' : conversion from 'size_t' to 'type', possible loss of data - /wd4371 # 'classname': layout of class may have changed from a previous version of the compiler due to better packing of member 'member' - /wd4514 # 'function' : unreferenced inline function has been removed - /wd4582 # 'type': constructor is not implicitly called - /wd4583 # 'type': destructor is not implicitly called - /wd4623 # 'derived class' : default constructor was implicitly defined as deleted because a base class default constructor is inaccessible or deleted - /wd4625 # 'derived class' : copy constructor was implicitly defined as deleted because a base class copy constructor is inaccessible or deleted - /wd4626 # 'derived class' : assignment operator was implicitly defined as deleted because a base class assignment operator is inaccessible or deleted - /wd4710 # 'function' : function not inlined - /wd4711 # function 'function' selected for inline expansion - /wd4820 # 'bytes' bytes padding added after construct 'member_name' - /wd4996 - /wd5026 # 'type': move constructor was implicitly defined as deleted - /wd5027 # 'type': move assignment operator was implicitly defined as deleted - /wd5045 # Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified - /wd5053 # support for 'explicit()' in C++17 and earlier is a vendor extension - /wd5204 # 'type-name': class has virtual functions, but its trivial destructor is not virtual; instances of objects derived from this class may not be destructed correctly - /wd5220 # 'member': a non-static data member with a volatile qualified type no longer implies that compiler generated copy / move constructors and copy / move assignment operators are not trivial + /wd4005 # macro redefinition + /wd4061 # enumerator 'identifier' in switch of enum 'enumeration' is not explicitly handled by a case label + /wd4068 # unknown pragma + /wd4200 # nonstandard extension used : zero-sized array in struct/union + /wd4201 # nonstandard extension used : nameless struct/union + /wd4265 # 'type': class has virtual functions, but its non-trivial destructor is not virtual; instances of this class may not be destructed correctly + /wd4266 # 'function' : no override available for virtual member function from base 'type'; function is hidden + /wd4267 # 'var' : conversion from 'size_t' to 'type', possible loss of data + /wd4371 # 'classname': layout of class may have changed from a previous version of the compiler due to better packing of member 'member' + /wd4514 # 'function' : unreferenced inline function has been removed + /wd4582 # 'type': constructor is not implicitly called + /wd4583 # 'type': destructor is not implicitly called + /wd4623 # 'derived class' : default constructor was implicitly defined as deleted because a base class default constructor is inaccessible or deleted + /wd4625 # 'derived class' : copy constructor was implicitly defined as deleted because a base class copy constructor is inaccessible or deleted + /wd4626 # 'derived class' : assignment operator was implicitly defined as deleted because a base class assignment operator is inaccessible or deleted + /wd4710 # 'function' : function not inlined + /wd4711 # function 'function' selected for inline expansion + /wd4820 # 'bytes' bytes padding added after construct 'member_name' + /wd4996 + /wd5026 # 'type': move constructor was implicitly defined as deleted + /wd5027 # 'type': move assignment operator was implicitly defined as deleted + /wd5045 # Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified + /wd5053 # support for 'explicit()' in C++17 and earlier is a vendor extension + /wd5204 # 'type-name': class has virtual functions, but its trivial destructor is not virtual; instances of objects derived from this class may not be destructed correctly + /wd5220 # 'member': a non-static data member with a volatile qualified type no longer implies that compiler generated copy / move constructors and copy / move assignment operators are not trivial ) endif() target_include_directories( ${TARGET_NAME} PUBLIC - "$" - "$" + "$" + "$" ) target_link_libraries( ${TARGET_NAME} PUBLIC - spdlog::spdlog - Version.lib - Dbghelp.lib - Ws2_32.lib + spdlog::spdlog + Version.lib + Dbghelp.lib + Ws2_32.lib ) if(SFSE_SUPPORT_XBYAK) - if(USING_VCPKG) - find_package(xbyak CONFIG REQUIRED) - else() - CPMAddPackage("gh:herumi/xbyak@6.73") - endif() - - target_link_libraries( - ${TARGET_NAME} - PUBLIC - xbyak::xbyak - ) + find_package(xbyak CONFIG REQUIRED) endif() target_precompile_headers( ${TARGET_NAME} PRIVATE - include/SFSE/Impl/PCH.h + include/SFSE/Impl/PCH.h ) endfunction() @@ -156,9 +134,8 @@ if(SFSE_BUILD_TESTS) add_library( ${PROJECT_NAME}-test STATIC - ${SOURCES} - .clang-format - ${CMAKE_CURRENT_SOURCE_DIR}/test/test.cpp + ${SOURCES} + ${CMAKE_CURRENT_SOURCE_DIR}/test/test.cpp ) configure_target(${PROJECT_NAME}-test) set(PROJECT_NAME ${PROJECT_NAME}-test) @@ -166,24 +143,16 @@ else() add_library( ${PROJECT_NAME} STATIC - ${SOURCES} - .clang-format + ${SOURCES} ) add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) configure_target(${PROJECT_NAME}) endif() -if(USING_VCPKG) - install( - TARGETS ${PROJECT_NAME} - EXPORT ${PROJECT_NAME}-targets - ) -else() - install( - TARGETS ${PROJECT_NAME} spdlog - EXPORT ${PROJECT_NAME}-targets - ) -endif() +install( + TARGETS ${PROJECT_NAME} + EXPORT ${PROJECT_NAME}-targets +) install( EXPORT ${PROJECT_NAME}-targets @@ -209,15 +178,8 @@ install( install( DIRECTORY - include/RE - include/REL - include/SFSE + include/RE + include/REL + include/SFSE DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) - -if(NOT USING_VCPKG) -set_property( - TARGET ${PROJECT_NAME} - APPEND PROPERTY ADDITIONAL_CLEAN_FILES ${CPM_SOURCE_CACHE} ${CMAKE_CURRENT_BINARY_DIR}/_deps -) -endif() diff --git a/CommonLibSF/CMakePresets.json b/CommonLibSF/CMakePresets.json index a03065a0..d6c6178d 100644 --- a/CommonLibSF/CMakePresets.json +++ b/CommonLibSF/CMakePresets.json @@ -20,8 +20,7 @@ "cacheVariables": { "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", "VCPKG_TARGET_TRIPLET": "x64-windows-static-md", - "VCPKG_HOST_TRIPLET": "x64-windows-static-md", - "USING_VCPKG": true + "VCPKG_HOST_TRIPLET": "x64-windows-static-md" } }, { @@ -108,7 +107,7 @@ } }, { - "name": "build-debug-msvc-msvc-vcpkg", + "name": "build-debug-msvc-msvc", "inherits": [ "common", "packaging-vcpkg", @@ -118,7 +117,7 @@ ] }, { - "name": "build-debug-msvc-ninja-vcpkg", + "name": "build-debug-msvc-ninja", "inherits": [ "common", "packaging-vcpkg", @@ -128,7 +127,7 @@ ] }, { - "name": "build-debug-clang-cl-msvc-vcpkg", + "name": "build-debug-clang-cl-msvc", "toolset": "ClangCL", "inherits": [ "common", @@ -139,7 +138,7 @@ ] }, { - "name": "build-debug-clang-cl-ninja-vcpkg", + "name": "build-debug-clang-cl-ninja", "inherits": [ "common", "packaging-vcpkg", @@ -149,7 +148,7 @@ ] }, { - "name": "build-release-msvc-msvc-vcpkg", + "name": "build-release-msvc-msvc", "inherits": [ "common", "packaging-vcpkg", @@ -159,7 +158,7 @@ ] }, { - "name": "build-release-msvc-ninja-vcpkg", + "name": "build-release-msvc-ninja", "inherits": [ "common", "packaging-vcpkg", @@ -169,7 +168,7 @@ ] }, { - "name": "build-release-clang-cl-msvc-vcpkg", + "name": "build-release-clang-cl-msvc", "toolset": "ClangCL", "inherits": [ "common", @@ -180,7 +179,7 @@ ] }, { - "name": "build-release-clang-cl-ninja-vcpkg", + "name": "build-release-clang-cl-ninja", "inherits": [ "common", "packaging-vcpkg", @@ -188,162 +187,48 @@ "generator-ninja", "compiler-clang-cl" ] - }, - { - "name": "build-debug-msvc-msvc-cpm", - "inherits": [ - "common", - "buildtype-debug-msvc", - "generator-msvc", - "compiler-msvc" - ] - }, - { - "name": "build-debug-msvc-ninja-cpm", - "inherits": [ - "common", - "buildtype-debug-msvc", - "generator-ninja", - "compiler-msvc" - ] - }, - { - "name": "build-debug-clang-cl-msvc-cpm", - "toolset": "ClangCL", - "inherits": [ - "common", - "buildtype-debug-clang-cl", - "generator-msvc", - "compiler-clang-cl" - ] - }, - { - "name": "build-debug-clang-cl-ninja-cpm", - "inherits": [ - "common", - "buildtype-debug-clang-cl", - "generator-ninja", - "compiler-clang-cl" - ] - }, - { - "name": "build-release-msvc-msvc-cpm", - "inherits": [ - "common", - "buildtype-release-msvc", - "generator-msvc", - "compiler-msvc" - ] - }, - { - "name": "build-release-msvc-ninja-cpm", - "inherits": [ - "common", - "buildtype-release-msvc", - "generator-ninja", - "compiler-msvc" - ] - }, - { - "name": "build-release-clang-cl-msvc-cpm", - "toolset": "ClangCL", - "inherits": [ - "common", - "buildtype-release-clang-cl", - "generator-msvc", - "compiler-clang-cl" - ] - }, - { - "name": "build-release-clang-cl-ninja-cpm", - "inherits": [ - "common", - "buildtype-release-clang-cl", - "generator-ninja", - "compiler-clang-cl" - ] } ], "buildPresets": [ { - "name": "debug-msvc-ninja-vcpkg", - "configurePreset": "build-debug-msvc-ninja-vcpkg", - "displayName": "01. (Debug) MSVC - Ninja - vcpkg" - }, - { - "name": "release-msvc-ninja-vcpkg", - "configurePreset": "build-release-msvc-ninja-vcpkg", - "displayName": "02. (Release) MSVC - Ninja - vcpkg" - }, - { - "name": "debug-msvc-msvc-vcpkg", - "configurePreset": "build-debug-msvc-msvc-vcpkg", - "displayName": "03. (Debug) MSVC - MSVC - vcpkg" - }, - { - "name": "release-msvc-msvc-vcpkg", - "configurePreset": "build-release-msvc-msvc-vcpkg", - "displayName": "04. (Release) MSVC - MSVC - vcpkg" - }, - { - "name": "debug-clang-cl-ninja-vcpkg", - "configurePreset": "build-debug-clang-cl-ninja-vcpkg", - "displayName": "05. (Debug) Clang - Ninja - vcpkg" - }, - { - "name": "release-clang-cl-ninja-vcpkg", - "configurePreset": "build-release-clang-cl-ninja-vcpkg", - "displayName": "06. (Release) Clang - Ninja - vcpkg" - }, - { - "name": "debug-clang-cl-msvc-vcpkg", - "configurePreset": "build-debug-clang-cl-msvc-vcpkg", - "displayName": "07. (Debug) Clang - MSVC - vcpkg" - }, - { - "name": "release-clang-cl-msvc-vcpkg", - "configurePreset": "build-release-clang-cl-msvc-vcpkg", - "displayName": "08. (Release) Clang - MSVC - vcpkg" - }, - { - "name": "debug-msvc-ninja-cpm", - "configurePreset": "build-debug-msvc-ninja-cpm", - "displayName": "09. (Debug) MSVC - Ninja - CPM" + "name": "debug-msvc-ninja", + "configurePreset": "build-debug-msvc-ninja", + "displayName": "1. (Debug) MSVC - Ninja" }, { - "name": "release-msvc-ninja-cpm", - "configurePreset": "build-release-msvc-ninja-cpm", - "displayName": "10. (Release) MSVC - Ninja - CPM" + "name": "release-msvc-ninja", + "configurePreset": "build-release-msvc-ninja", + "displayName": "2. (Release) MSVC - Ninja" }, { - "name": "debug-msvc-msvc-cpm", - "configurePreset": "build-debug-msvc-msvc-cpm", - "displayName": "11. (Debug) MSVC - MSVC - CPM" + "name": "debug-msvc-msvc", + "configurePreset": "build-debug-msvc-msvc", + "displayName": "3. (Debug) MSVC - MSVC" }, { - "name": "release-msvc-msvc-cpm", - "configurePreset": "build-release-msvc-msvc-cpm", - "displayName": "12. (Release) MSVC - MSVC - CPM" + "name": "release-msvc-msvc", + "configurePreset": "build-release-msvc-msvc", + "displayName": "4. (Release) MSVC - MSVC" }, { - "name": "debug-clang-cl-ninja-cpm", - "configurePreset": "build-debug-clang-cl-ninja-cpm", - "displayName": "13. (Debug) Clang - Ninja - CPM" + "name": "debug-clang-cl-ninja", + "configurePreset": "build-debug-clang-cl-ninja", + "displayName": "5. (Debug) Clang - Ninja" }, { - "name": "release-clang-cl-ninja-cpm", - "configurePreset": "build-release-clang-cl-ninja-cpm", - "displayName": "14. (Release) Clang - Ninja - CPM" + "name": "release-clang-cl-ninja", + "configurePreset": "build-release-clang-cl-ninja", + "displayName": "6. (Release) Clang - Ninja" }, { - "name": "debug-clang-cl-msvc-cpm", - "configurePreset": "build-debug-clang-cl-msvc-cpm", - "displayName": "15. (Debug) Clang - MSVC - CPM" + "name": "debug-clang-cl-msvc", + "configurePreset": "build-debug-clang-cl-msvc", + "displayName": "7. (Debug) Clang - MSVC" }, { - "name": "release-clang-cl-msvc-cpm", - "configurePreset": "build-release-clang-cl-msvc-cpm", - "displayName": "16. (Release) Clang - MSVC - CPM" + "name": "release-clang-cl-msvc", + "configurePreset": "build-release-clang-cl-msvc", + "displayName": "8. (Release) Clang - MSVC" } ] } diff --git a/CommonLibSF/cmake/CPM.cmake b/CommonLibSF/cmake/CPM.cmake deleted file mode 100644 index 7ffb16b6..00000000 --- a/CommonLibSF/cmake/CPM.cmake +++ /dev/null @@ -1,1155 +0,0 @@ -# CPM.cmake - CMake's missing package manager -# =========================================== -# See https://github.com/cpm-cmake/CPM.cmake for usage and update instructions. -# -# MIT License -# ----------- -#[[ - Copyright (c) 2019-2023 Lars Melchior and contributors - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -]] - -cmake_minimum_required(VERSION 3.14 FATAL_ERROR) - -# Initialize logging prefix -if(NOT CPM_INDENT) - set(CPM_INDENT - "CPM:" - CACHE INTERNAL "" - ) -endif() - -if(NOT COMMAND cpm_message) - function(cpm_message) - message(${ARGV}) - endfunction() -endif() - -set(CURRENT_CPM_VERSION 0.38.6) - -get_filename_component(CPM_CURRENT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" REALPATH) -if(CPM_DIRECTORY) - if(NOT CPM_DIRECTORY STREQUAL CPM_CURRENT_DIRECTORY) - if(CPM_VERSION VERSION_LESS CURRENT_CPM_VERSION) - message( - AUTHOR_WARNING - "${CPM_INDENT} \ -A dependency is using a more recent CPM version (${CURRENT_CPM_VERSION}) than the current project (${CPM_VERSION}). \ -It is recommended to upgrade CPM to the most recent version. \ -See https://github.com/cpm-cmake/CPM.cmake for more information." - ) - endif() - if(${CMAKE_VERSION} VERSION_LESS "3.17.0") - include(FetchContent) - endif() - return() - endif() - - get_property( - CPM_INITIALIZED GLOBAL "" - PROPERTY CPM_INITIALIZED - SET - ) - if(CPM_INITIALIZED) - return() - endif() -endif() - -if(CURRENT_CPM_VERSION MATCHES "development-version") - message( - WARNING "${CPM_INDENT} Your project is using an unstable development version of CPM.cmake. \ -Please update to a recent release if possible. \ -See https://github.com/cpm-cmake/CPM.cmake for details." - ) -endif() - -set_property(GLOBAL PROPERTY CPM_INITIALIZED true) - -macro(cpm_set_policies) - # the policy allows us to change options without caching - cmake_policy(SET CMP0077 NEW) - set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) - - # the policy allows us to change set(CACHE) without caching - if(POLICY CMP0126) - cmake_policy(SET CMP0126 NEW) - set(CMAKE_POLICY_DEFAULT_CMP0126 NEW) - endif() - - # The policy uses the download time for timestamp, instead of the timestamp in the archive. This - # allows for proper rebuilds when a projects url changes - if(POLICY CMP0135) - cmake_policy(SET CMP0135 NEW) - set(CMAKE_POLICY_DEFAULT_CMP0135 NEW) - endif() -endmacro() -cpm_set_policies() - -option(CPM_USE_LOCAL_PACKAGES "Always try to use `find_package` to get dependencies" - $ENV{CPM_USE_LOCAL_PACKAGES} -) -option(CPM_LOCAL_PACKAGES_ONLY "Only use `find_package` to get dependencies" - $ENV{CPM_LOCAL_PACKAGES_ONLY} -) -option(CPM_DOWNLOAD_ALL "Always download dependencies from source" $ENV{CPM_DOWNLOAD_ALL}) -option(CPM_DONT_UPDATE_MODULE_PATH "Don't update the module path to allow using find_package" - $ENV{CPM_DONT_UPDATE_MODULE_PATH} -) -option(CPM_DONT_CREATE_PACKAGE_LOCK "Don't create a package lock file in the binary path" - $ENV{CPM_DONT_CREATE_PACKAGE_LOCK} -) -option(CPM_INCLUDE_ALL_IN_PACKAGE_LOCK - "Add all packages added through CPM.cmake to the package lock" - $ENV{CPM_INCLUDE_ALL_IN_PACKAGE_LOCK} -) -option(CPM_USE_NAMED_CACHE_DIRECTORIES - "Use additional directory of package name in cache on the most nested level." - $ENV{CPM_USE_NAMED_CACHE_DIRECTORIES} -) - -set(CPM_VERSION - ${CURRENT_CPM_VERSION} - CACHE INTERNAL "" -) -set(CPM_DIRECTORY - ${CPM_CURRENT_DIRECTORY} - CACHE INTERNAL "" -) -set(CPM_FILE - ${CMAKE_CURRENT_LIST_FILE} - CACHE INTERNAL "" -) -set(CPM_PACKAGES - "" - CACHE INTERNAL "" -) -set(CPM_DRY_RUN - OFF - CACHE INTERNAL "Don't download or configure dependencies (for testing)" -) - -if(DEFINED ENV{CPM_SOURCE_CACHE}) - set(CPM_SOURCE_CACHE_DEFAULT $ENV{CPM_SOURCE_CACHE}) -else() - set(CPM_SOURCE_CACHE_DEFAULT OFF) -endif() - -set(CPM_SOURCE_CACHE - ${CPM_SOURCE_CACHE_DEFAULT} - CACHE PATH "Directory to download CPM dependencies" -) - -if(NOT CPM_DONT_UPDATE_MODULE_PATH) - set(CPM_MODULE_PATH - "${CMAKE_BINARY_DIR}/CPM_modules" - CACHE INTERNAL "" - ) - # remove old modules - file(REMOVE_RECURSE ${CPM_MODULE_PATH}) - file(MAKE_DIRECTORY ${CPM_MODULE_PATH}) - # locally added CPM modules should override global packages - set(CMAKE_MODULE_PATH "${CPM_MODULE_PATH};${CMAKE_MODULE_PATH}") -endif() - -if(NOT CPM_DONT_CREATE_PACKAGE_LOCK) - set(CPM_PACKAGE_LOCK_FILE - "${CMAKE_BINARY_DIR}/cpm-package-lock.cmake" - CACHE INTERNAL "" - ) - file(WRITE ${CPM_PACKAGE_LOCK_FILE} - "# CPM Package Lock\n# This file should be committed to version control\n\n" - ) -endif() - -include(FetchContent) - -# Try to infer package name from git repository uri (path or url) -function(cpm_package_name_from_git_uri URI RESULT) - if("${URI}" MATCHES "([^/:]+)/?.git/?$") - set(${RESULT} - ${CMAKE_MATCH_1} - PARENT_SCOPE - ) - else() - unset(${RESULT} PARENT_SCOPE) - endif() -endfunction() - -# Try to infer package name and version from a url -function(cpm_package_name_and_ver_from_url url outName outVer) - if(url MATCHES "[/\\?]([a-zA-Z0-9_\\.-]+)\\.(tar|tar\\.gz|tar\\.bz2|zip|ZIP)(\\?|/|$)") - # We matched an archive - set(filename "${CMAKE_MATCH_1}") - - if(filename MATCHES "([a-zA-Z0-9_\\.-]+)[_-]v?(([0-9]+\\.)*[0-9]+[a-zA-Z0-9]*)") - # We matched - (ie foo-1.2.3) - set(${outName} - "${CMAKE_MATCH_1}" - PARENT_SCOPE - ) - set(${outVer} - "${CMAKE_MATCH_2}" - PARENT_SCOPE - ) - elseif(filename MATCHES "(([0-9]+\\.)+[0-9]+[a-zA-Z0-9]*)") - # We couldn't find a name, but we found a version - # - # In many cases (which we don't handle here) the url would look something like - # `irrelevant/ACTUAL_PACKAGE_NAME/irrelevant/1.2.3.zip`. In such a case we can't possibly - # distinguish the package name from the irrelevant bits. Moreover if we try to match the - # package name from the filename, we'd get bogus at best. - unset(${outName} PARENT_SCOPE) - set(${outVer} - "${CMAKE_MATCH_1}" - PARENT_SCOPE - ) - else() - # Boldly assume that the file name is the package name. - # - # Yes, something like `irrelevant/ACTUAL_NAME/irrelevant/download.zip` will ruin our day, but - # such cases should be quite rare. No popular service does this... we think. - set(${outName} - "${filename}" - PARENT_SCOPE - ) - unset(${outVer} PARENT_SCOPE) - endif() - else() - # No ideas yet what to do with non-archives - unset(${outName} PARENT_SCOPE) - unset(${outVer} PARENT_SCOPE) - endif() -endfunction() - -function(cpm_find_package NAME VERSION) - string(REPLACE " " ";" EXTRA_ARGS "${ARGN}") - find_package(${NAME} ${VERSION} ${EXTRA_ARGS} QUIET) - if(${CPM_ARGS_NAME}_FOUND) - if(DEFINED ${CPM_ARGS_NAME}_VERSION) - set(VERSION ${${CPM_ARGS_NAME}_VERSION}) - endif() - cpm_message(STATUS "${CPM_INDENT} Using local package ${CPM_ARGS_NAME}@${VERSION}") - CPMRegisterPackage(${CPM_ARGS_NAME} "${VERSION}") - set(CPM_PACKAGE_FOUND - YES - PARENT_SCOPE - ) - else() - set(CPM_PACKAGE_FOUND - NO - PARENT_SCOPE - ) - endif() -endfunction() - -# Create a custom FindXXX.cmake module for a CPM package This prevents `find_package(NAME)` from -# finding the system library -function(cpm_create_module_file Name) - if(NOT CPM_DONT_UPDATE_MODULE_PATH) - # erase any previous modules - file(WRITE ${CPM_MODULE_PATH}/Find${Name}.cmake - "include(\"${CPM_FILE}\")\n${ARGN}\nset(${Name}_FOUND TRUE)" - ) - endif() -endfunction() - -# Find a package locally or fallback to CPMAddPackage -function(CPMFindPackage) - set(oneValueArgs NAME VERSION GIT_TAG FIND_PACKAGE_ARGUMENTS) - - cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "" ${ARGN}) - - if(NOT DEFINED CPM_ARGS_VERSION) - if(DEFINED CPM_ARGS_GIT_TAG) - cpm_get_version_from_git_tag("${CPM_ARGS_GIT_TAG}" CPM_ARGS_VERSION) - endif() - endif() - - set(downloadPackage ${CPM_DOWNLOAD_ALL}) - if(DEFINED CPM_DOWNLOAD_${CPM_ARGS_NAME}) - set(downloadPackage ${CPM_DOWNLOAD_${CPM_ARGS_NAME}}) - elseif(DEFINED ENV{CPM_DOWNLOAD_${CPM_ARGS_NAME}}) - set(downloadPackage $ENV{CPM_DOWNLOAD_${CPM_ARGS_NAME}}) - endif() - if(downloadPackage) - CPMAddPackage(${ARGN}) - cpm_export_variables(${CPM_ARGS_NAME}) - return() - endif() - - cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}") - if(CPM_PACKAGE_ALREADY_ADDED) - cpm_export_variables(${CPM_ARGS_NAME}) - return() - endif() - - cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS}) - - if(NOT CPM_PACKAGE_FOUND) - CPMAddPackage(${ARGN}) - cpm_export_variables(${CPM_ARGS_NAME}) - endif() - -endfunction() - -# checks if a package has been added before -function(cpm_check_if_package_already_added CPM_ARGS_NAME CPM_ARGS_VERSION) - if("${CPM_ARGS_NAME}" IN_LIST CPM_PACKAGES) - CPMGetPackageVersion(${CPM_ARGS_NAME} CPM_PACKAGE_VERSION) - if("${CPM_PACKAGE_VERSION}" VERSION_LESS "${CPM_ARGS_VERSION}") - message( - WARNING - "${CPM_INDENT} Requires a newer version of ${CPM_ARGS_NAME} (${CPM_ARGS_VERSION}) than currently included (${CPM_PACKAGE_VERSION})." - ) - endif() - cpm_get_fetch_properties(${CPM_ARGS_NAME}) - set(${CPM_ARGS_NAME}_ADDED NO) - set(CPM_PACKAGE_ALREADY_ADDED - YES - PARENT_SCOPE - ) - cpm_export_variables(${CPM_ARGS_NAME}) - else() - set(CPM_PACKAGE_ALREADY_ADDED - NO - PARENT_SCOPE - ) - endif() -endfunction() - -# Parse the argument of CPMAddPackage in case a single one was provided and convert it to a list of -# arguments which can then be parsed idiomatically. For example gh:foo/bar@1.2.3 will be converted -# to: GITHUB_REPOSITORY;foo/bar;VERSION;1.2.3 -function(cpm_parse_add_package_single_arg arg outArgs) - # Look for a scheme - if("${arg}" MATCHES "^([a-zA-Z]+):(.+)$") - string(TOLOWER "${CMAKE_MATCH_1}" scheme) - set(uri "${CMAKE_MATCH_2}") - - # Check for CPM-specific schemes - if(scheme STREQUAL "gh") - set(out "GITHUB_REPOSITORY;${uri}") - set(packageType "git") - elseif(scheme STREQUAL "gl") - set(out "GITLAB_REPOSITORY;${uri}") - set(packageType "git") - elseif(scheme STREQUAL "bb") - set(out "BITBUCKET_REPOSITORY;${uri}") - set(packageType "git") - # A CPM-specific scheme was not found. Looks like this is a generic URL so try to determine - # type - elseif(arg MATCHES ".git/?(@|#|$)") - set(out "GIT_REPOSITORY;${arg}") - set(packageType "git") - else() - # Fall back to a URL - set(out "URL;${arg}") - set(packageType "archive") - - # We could also check for SVN since FetchContent supports it, but SVN is so rare these days. - # We just won't bother with the additional complexity it will induce in this function. SVN is - # done by multi-arg - endif() - else() - if(arg MATCHES ".git/?(@|#|$)") - set(out "GIT_REPOSITORY;${arg}") - set(packageType "git") - else() - # Give up - message(FATAL_ERROR "${CPM_INDENT} Can't determine package type of '${arg}'") - endif() - endif() - - # For all packages we interpret @... as version. Only replace the last occurrence. Thus URIs - # containing '@' can be used - string(REGEX REPLACE "@([^@]+)$" ";VERSION;\\1" out "${out}") - - # Parse the rest according to package type - if(packageType STREQUAL "git") - # For git repos we interpret #... as a tag or branch or commit hash - string(REGEX REPLACE "#([^#]+)$" ";GIT_TAG;\\1" out "${out}") - elseif(packageType STREQUAL "archive") - # For archives we interpret #... as a URL hash. - string(REGEX REPLACE "#([^#]+)$" ";URL_HASH;\\1" out "${out}") - # We don't try to parse the version if it's not provided explicitly. cpm_get_version_from_url - # should do this at a later point - else() - # We should never get here. This is an assertion and hitting it means there's a bug in the code - # above. A packageType was set, but not handled by this if-else. - message(FATAL_ERROR "${CPM_INDENT} Unsupported package type '${packageType}' of '${arg}'") - endif() - - set(${outArgs} - ${out} - PARENT_SCOPE - ) -endfunction() - -# Check that the working directory for a git repo is clean -function(cpm_check_git_working_dir_is_clean repoPath gitTag isClean) - - find_package(Git REQUIRED) - - if(NOT GIT_EXECUTABLE) - # No git executable, assume directory is clean - set(${isClean} - TRUE - PARENT_SCOPE - ) - return() - endif() - - # check for uncommitted changes - execute_process( - COMMAND ${GIT_EXECUTABLE} status --porcelain - RESULT_VARIABLE resultGitStatus - OUTPUT_VARIABLE repoStatus - OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET - WORKING_DIRECTORY ${repoPath} - ) - if(resultGitStatus) - # not supposed to happen, assume clean anyway - message(WARNING "${CPM_INDENT} Calling git status on folder ${repoPath} failed") - set(${isClean} - TRUE - PARENT_SCOPE - ) - return() - endif() - - if(NOT "${repoStatus}" STREQUAL "") - set(${isClean} - FALSE - PARENT_SCOPE - ) - return() - endif() - - # check for committed changes - execute_process( - COMMAND ${GIT_EXECUTABLE} diff -s --exit-code ${gitTag} - RESULT_VARIABLE resultGitDiff - OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_QUIET - WORKING_DIRECTORY ${repoPath} - ) - - if(${resultGitDiff} EQUAL 0) - set(${isClean} - TRUE - PARENT_SCOPE - ) - else() - set(${isClean} - FALSE - PARENT_SCOPE - ) - endif() - -endfunction() - -# method to overwrite internal FetchContent properties, to allow using CPM.cmake to overload -# FetchContent calls. As these are internal cmake properties, this method should be used carefully -# and may need modification in future CMake versions. Source: -# https://github.com/Kitware/CMake/blob/dc3d0b5a0a7d26d43d6cfeb511e224533b5d188f/Modules/FetchContent.cmake#L1152 -function(cpm_override_fetchcontent contentName) - cmake_parse_arguments(PARSE_ARGV 1 arg "" "SOURCE_DIR;BINARY_DIR" "") - if(NOT "${arg_UNPARSED_ARGUMENTS}" STREQUAL "") - message(FATAL_ERROR "${CPM_INDENT} Unsupported arguments: ${arg_UNPARSED_ARGUMENTS}") - endif() - - string(TOLOWER ${contentName} contentNameLower) - set(prefix "_FetchContent_${contentNameLower}") - - set(propertyName "${prefix}_sourceDir") - define_property( - GLOBAL - PROPERTY ${propertyName} - BRIEF_DOCS "Internal implementation detail of FetchContent_Populate()" - FULL_DOCS "Details used by FetchContent_Populate() for ${contentName}" - ) - set_property(GLOBAL PROPERTY ${propertyName} "${arg_SOURCE_DIR}") - - set(propertyName "${prefix}_binaryDir") - define_property( - GLOBAL - PROPERTY ${propertyName} - BRIEF_DOCS "Internal implementation detail of FetchContent_Populate()" - FULL_DOCS "Details used by FetchContent_Populate() for ${contentName}" - ) - set_property(GLOBAL PROPERTY ${propertyName} "${arg_BINARY_DIR}") - - set(propertyName "${prefix}_populated") - define_property( - GLOBAL - PROPERTY ${propertyName} - BRIEF_DOCS "Internal implementation detail of FetchContent_Populate()" - FULL_DOCS "Details used by FetchContent_Populate() for ${contentName}" - ) - set_property(GLOBAL PROPERTY ${propertyName} TRUE) -endfunction() - -# Download and add a package from source -function(CPMAddPackage) - cpm_set_policies() - - list(LENGTH ARGN argnLength) - if(argnLength EQUAL 1) - cpm_parse_add_package_single_arg("${ARGN}" ARGN) - - # The shorthand syntax implies EXCLUDE_FROM_ALL and SYSTEM - set(ARGN "${ARGN};EXCLUDE_FROM_ALL;YES;SYSTEM;YES;") - endif() - - set(oneValueArgs - NAME - FORCE - VERSION - GIT_TAG - DOWNLOAD_ONLY - GITHUB_REPOSITORY - GITLAB_REPOSITORY - BITBUCKET_REPOSITORY - GIT_REPOSITORY - SOURCE_DIR - FIND_PACKAGE_ARGUMENTS - NO_CACHE - SYSTEM - GIT_SHALLOW - EXCLUDE_FROM_ALL - SOURCE_SUBDIR - ) - - set(multiValueArgs URL OPTIONS DOWNLOAD_COMMAND) - - cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}") - - # Set default values for arguments - - if(NOT DEFINED CPM_ARGS_VERSION) - if(DEFINED CPM_ARGS_GIT_TAG) - cpm_get_version_from_git_tag("${CPM_ARGS_GIT_TAG}" CPM_ARGS_VERSION) - endif() - endif() - - if(CPM_ARGS_DOWNLOAD_ONLY) - set(DOWNLOAD_ONLY ${CPM_ARGS_DOWNLOAD_ONLY}) - else() - set(DOWNLOAD_ONLY NO) - endif() - - if(DEFINED CPM_ARGS_GITHUB_REPOSITORY) - set(CPM_ARGS_GIT_REPOSITORY "https://github.com/${CPM_ARGS_GITHUB_REPOSITORY}.git") - elseif(DEFINED CPM_ARGS_GITLAB_REPOSITORY) - set(CPM_ARGS_GIT_REPOSITORY "https://gitlab.com/${CPM_ARGS_GITLAB_REPOSITORY}.git") - elseif(DEFINED CPM_ARGS_BITBUCKET_REPOSITORY) - set(CPM_ARGS_GIT_REPOSITORY "https://bitbucket.org/${CPM_ARGS_BITBUCKET_REPOSITORY}.git") - endif() - - if(DEFINED CPM_ARGS_GIT_REPOSITORY) - list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_REPOSITORY ${CPM_ARGS_GIT_REPOSITORY}) - if(NOT DEFINED CPM_ARGS_GIT_TAG) - set(CPM_ARGS_GIT_TAG v${CPM_ARGS_VERSION}) - endif() - - # If a name wasn't provided, try to infer it from the git repo - if(NOT DEFINED CPM_ARGS_NAME) - cpm_package_name_from_git_uri(${CPM_ARGS_GIT_REPOSITORY} CPM_ARGS_NAME) - endif() - endif() - - set(CPM_SKIP_FETCH FALSE) - - if(DEFINED CPM_ARGS_GIT_TAG) - list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_TAG ${CPM_ARGS_GIT_TAG}) - # If GIT_SHALLOW is explicitly specified, honor the value. - if(DEFINED CPM_ARGS_GIT_SHALLOW) - list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_SHALLOW ${CPM_ARGS_GIT_SHALLOW}) - endif() - endif() - - if(DEFINED CPM_ARGS_URL) - # If a name or version aren't provided, try to infer them from the URL - list(GET CPM_ARGS_URL 0 firstUrl) - cpm_package_name_and_ver_from_url(${firstUrl} nameFromUrl verFromUrl) - # If we fail to obtain name and version from the first URL, we could try other URLs if any. - # However multiple URLs are expected to be quite rare, so for now we won't bother. - - # If the caller provided their own name and version, they trump the inferred ones. - if(NOT DEFINED CPM_ARGS_NAME) - set(CPM_ARGS_NAME ${nameFromUrl}) - endif() - if(NOT DEFINED CPM_ARGS_VERSION) - set(CPM_ARGS_VERSION ${verFromUrl}) - endif() - - list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS URL "${CPM_ARGS_URL}") - endif() - - # Check for required arguments - - if(NOT DEFINED CPM_ARGS_NAME) - message( - FATAL_ERROR - "${CPM_INDENT} 'NAME' was not provided and couldn't be automatically inferred for package added with arguments: '${ARGN}'" - ) - endif() - - # Check if package has been added before - cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}") - if(CPM_PACKAGE_ALREADY_ADDED) - cpm_export_variables(${CPM_ARGS_NAME}) - return() - endif() - - # Check for manual overrides - if(NOT CPM_ARGS_FORCE AND NOT "${CPM_${CPM_ARGS_NAME}_SOURCE}" STREQUAL "") - set(PACKAGE_SOURCE ${CPM_${CPM_ARGS_NAME}_SOURCE}) - set(CPM_${CPM_ARGS_NAME}_SOURCE "") - CPMAddPackage( - NAME "${CPM_ARGS_NAME}" - SOURCE_DIR "${PACKAGE_SOURCE}" - EXCLUDE_FROM_ALL "${CPM_ARGS_EXCLUDE_FROM_ALL}" - SYSTEM "${CPM_ARGS_SYSTEM}" - OPTIONS "${CPM_ARGS_OPTIONS}" - SOURCE_SUBDIR "${CPM_ARGS_SOURCE_SUBDIR}" - DOWNLOAD_ONLY "${DOWNLOAD_ONLY}" - FORCE True - ) - cpm_export_variables(${CPM_ARGS_NAME}) - return() - endif() - - # Check for available declaration - if(NOT CPM_ARGS_FORCE AND NOT "${CPM_DECLARATION_${CPM_ARGS_NAME}}" STREQUAL "") - set(declaration ${CPM_DECLARATION_${CPM_ARGS_NAME}}) - set(CPM_DECLARATION_${CPM_ARGS_NAME} "") - CPMAddPackage(${declaration}) - cpm_export_variables(${CPM_ARGS_NAME}) - # checking again to ensure version and option compatibility - cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}") - return() - endif() - - if(NOT CPM_ARGS_FORCE) - if(CPM_USE_LOCAL_PACKAGES OR CPM_LOCAL_PACKAGES_ONLY) - cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS}) - - if(CPM_PACKAGE_FOUND) - cpm_export_variables(${CPM_ARGS_NAME}) - return() - endif() - - if(CPM_LOCAL_PACKAGES_ONLY) - message( - SEND_ERROR - "${CPM_INDENT} ${CPM_ARGS_NAME} not found via find_package(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION})" - ) - endif() - endif() - endif() - - CPMRegisterPackage("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}") - - if(DEFINED CPM_ARGS_GIT_TAG) - set(PACKAGE_INFO "${CPM_ARGS_GIT_TAG}") - elseif(DEFINED CPM_ARGS_SOURCE_DIR) - set(PACKAGE_INFO "${CPM_ARGS_SOURCE_DIR}") - else() - set(PACKAGE_INFO "${CPM_ARGS_VERSION}") - endif() - - if(DEFINED FETCHCONTENT_BASE_DIR) - # respect user's FETCHCONTENT_BASE_DIR if set - set(CPM_FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR}) - else() - set(CPM_FETCHCONTENT_BASE_DIR ${CMAKE_BINARY_DIR}/_deps) - endif() - - if(DEFINED CPM_ARGS_DOWNLOAD_COMMAND) - list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS DOWNLOAD_COMMAND ${CPM_ARGS_DOWNLOAD_COMMAND}) - elseif(DEFINED CPM_ARGS_SOURCE_DIR) - list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS SOURCE_DIR ${CPM_ARGS_SOURCE_DIR}) - if(NOT IS_ABSOLUTE ${CPM_ARGS_SOURCE_DIR}) - # Expand `CPM_ARGS_SOURCE_DIR` relative path. This is important because EXISTS doesn't work - # for relative paths. - get_filename_component( - source_directory ${CPM_ARGS_SOURCE_DIR} REALPATH BASE_DIR ${CMAKE_CURRENT_BINARY_DIR} - ) - else() - set(source_directory ${CPM_ARGS_SOURCE_DIR}) - endif() - if(NOT EXISTS ${source_directory}) - string(TOLOWER ${CPM_ARGS_NAME} lower_case_name) - # remove timestamps so CMake will re-download the dependency - file(REMOVE_RECURSE "${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-subbuild") - endif() - elseif(CPM_SOURCE_CACHE AND NOT CPM_ARGS_NO_CACHE) - string(TOLOWER ${CPM_ARGS_NAME} lower_case_name) - set(origin_parameters ${CPM_ARGS_UNPARSED_ARGUMENTS}) - list(SORT origin_parameters) - if(CPM_USE_NAMED_CACHE_DIRECTORIES) - string(SHA1 origin_hash "${origin_parameters};NEW_CACHE_STRUCTURE_TAG") - set(download_directory ${CPM_SOURCE_CACHE}/${lower_case_name}/${origin_hash}/${CPM_ARGS_NAME}) - else() - string(SHA1 origin_hash "${origin_parameters}") - set(download_directory ${CPM_SOURCE_CACHE}/${lower_case_name}/${origin_hash}) - endif() - # Expand `download_directory` relative path. This is important because EXISTS doesn't work for - # relative paths. - get_filename_component(download_directory ${download_directory} ABSOLUTE) - list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS SOURCE_DIR ${download_directory}) - - if(CPM_SOURCE_CACHE) - file(LOCK ${download_directory}/../cmake.lock) - endif() - - if(EXISTS ${download_directory}) - if(CPM_SOURCE_CACHE) - file(LOCK ${download_directory}/../cmake.lock RELEASE) - endif() - - cpm_store_fetch_properties( - ${CPM_ARGS_NAME} "${download_directory}" - "${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-build" - ) - cpm_get_fetch_properties("${CPM_ARGS_NAME}") - - if(DEFINED CPM_ARGS_GIT_TAG AND NOT (PATCH_COMMAND IN_LIST CPM_ARGS_UNPARSED_ARGUMENTS)) - # warn if cache has been changed since checkout - cpm_check_git_working_dir_is_clean(${download_directory} ${CPM_ARGS_GIT_TAG} IS_CLEAN) - if(NOT ${IS_CLEAN}) - message( - WARNING "${CPM_INDENT} Cache for ${CPM_ARGS_NAME} (${download_directory}) is dirty" - ) - endif() - endif() - - cpm_add_subdirectory( - "${CPM_ARGS_NAME}" - "${DOWNLOAD_ONLY}" - "${${CPM_ARGS_NAME}_SOURCE_DIR}/${CPM_ARGS_SOURCE_SUBDIR}" - "${${CPM_ARGS_NAME}_BINARY_DIR}" - "${CPM_ARGS_EXCLUDE_FROM_ALL}" - "${CPM_ARGS_SYSTEM}" - "${CPM_ARGS_OPTIONS}" - ) - set(PACKAGE_INFO "${PACKAGE_INFO} at ${download_directory}") - - # As the source dir is already cached/populated, we override the call to FetchContent. - set(CPM_SKIP_FETCH TRUE) - cpm_override_fetchcontent( - "${lower_case_name}" SOURCE_DIR "${${CPM_ARGS_NAME}_SOURCE_DIR}/${CPM_ARGS_SOURCE_SUBDIR}" - BINARY_DIR "${${CPM_ARGS_NAME}_BINARY_DIR}" - ) - - else() - # Enable shallow clone when GIT_TAG is not a commit hash. Our guess may not be accurate, but - # it should guarantee no commit hash get mis-detected. - if(NOT DEFINED CPM_ARGS_GIT_SHALLOW) - cpm_is_git_tag_commit_hash("${CPM_ARGS_GIT_TAG}" IS_HASH) - if(NOT ${IS_HASH}) - list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_SHALLOW TRUE) - endif() - endif() - - # remove timestamps so CMake will re-download the dependency - file(REMOVE_RECURSE ${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-subbuild) - set(PACKAGE_INFO "${PACKAGE_INFO} to ${download_directory}") - endif() - endif() - - cpm_create_module_file(${CPM_ARGS_NAME} "CPMAddPackage(\"${ARGN}\")") - - if(CPM_PACKAGE_LOCK_ENABLED) - if((CPM_ARGS_VERSION AND NOT CPM_ARGS_SOURCE_DIR) OR CPM_INCLUDE_ALL_IN_PACKAGE_LOCK) - cpm_add_to_package_lock(${CPM_ARGS_NAME} "${ARGN}") - elseif(CPM_ARGS_SOURCE_DIR) - cpm_add_comment_to_package_lock(${CPM_ARGS_NAME} "local directory") - else() - cpm_add_comment_to_package_lock(${CPM_ARGS_NAME} "${ARGN}") - endif() - endif() - - cpm_message( - STATUS "${CPM_INDENT} Adding package ${CPM_ARGS_NAME}@${CPM_ARGS_VERSION} (${PACKAGE_INFO})" - ) - - if(NOT CPM_SKIP_FETCH) - cpm_declare_fetch( - "${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}" "${PACKAGE_INFO}" "${CPM_ARGS_UNPARSED_ARGUMENTS}" - ) - cpm_fetch_package("${CPM_ARGS_NAME}" populated) - if(CPM_SOURCE_CACHE AND download_directory) - file(LOCK ${download_directory}/../cmake.lock RELEASE) - endif() - if(${populated}) - cpm_add_subdirectory( - "${CPM_ARGS_NAME}" - "${DOWNLOAD_ONLY}" - "${${CPM_ARGS_NAME}_SOURCE_DIR}/${CPM_ARGS_SOURCE_SUBDIR}" - "${${CPM_ARGS_NAME}_BINARY_DIR}" - "${CPM_ARGS_EXCLUDE_FROM_ALL}" - "${CPM_ARGS_SYSTEM}" - "${CPM_ARGS_OPTIONS}" - ) - endif() - cpm_get_fetch_properties("${CPM_ARGS_NAME}") - endif() - - set(${CPM_ARGS_NAME}_ADDED YES) - cpm_export_variables("${CPM_ARGS_NAME}") -endfunction() - -# Fetch a previously declared package -macro(CPMGetPackage Name) - if(DEFINED "CPM_DECLARATION_${Name}") - CPMAddPackage(NAME ${Name}) - else() - message(SEND_ERROR "${CPM_INDENT} Cannot retrieve package ${Name}: no declaration available") - endif() -endmacro() - -# export variables available to the caller to the parent scope expects ${CPM_ARGS_NAME} to be set -macro(cpm_export_variables name) - set(${name}_SOURCE_DIR - "${${name}_SOURCE_DIR}" - PARENT_SCOPE - ) - set(${name}_BINARY_DIR - "${${name}_BINARY_DIR}" - PARENT_SCOPE - ) - set(${name}_ADDED - "${${name}_ADDED}" - PARENT_SCOPE - ) - set(CPM_LAST_PACKAGE_NAME - "${name}" - PARENT_SCOPE - ) -endmacro() - -# declares a package, so that any call to CPMAddPackage for the package name will use these -# arguments instead. Previous declarations will not be overridden. -macro(CPMDeclarePackage Name) - if(NOT DEFINED "CPM_DECLARATION_${Name}") - set("CPM_DECLARATION_${Name}" "${ARGN}") - endif() -endmacro() - -function(cpm_add_to_package_lock Name) - if(NOT CPM_DONT_CREATE_PACKAGE_LOCK) - cpm_prettify_package_arguments(PRETTY_ARGN false ${ARGN}) - file(APPEND ${CPM_PACKAGE_LOCK_FILE} "# ${Name}\nCPMDeclarePackage(${Name}\n${PRETTY_ARGN})\n") - endif() -endfunction() - -function(cpm_add_comment_to_package_lock Name) - if(NOT CPM_DONT_CREATE_PACKAGE_LOCK) - cpm_prettify_package_arguments(PRETTY_ARGN true ${ARGN}) - file(APPEND ${CPM_PACKAGE_LOCK_FILE} - "# ${Name} (unversioned)\n# CPMDeclarePackage(${Name}\n${PRETTY_ARGN}#)\n" - ) - endif() -endfunction() - -# includes the package lock file if it exists and creates a target `cpm-update-package-lock` to -# update it -macro(CPMUsePackageLock file) - if(NOT CPM_DONT_CREATE_PACKAGE_LOCK) - get_filename_component(CPM_ABSOLUTE_PACKAGE_LOCK_PATH ${file} ABSOLUTE) - if(EXISTS ${CPM_ABSOLUTE_PACKAGE_LOCK_PATH}) - include(${CPM_ABSOLUTE_PACKAGE_LOCK_PATH}) - endif() - if(NOT TARGET cpm-update-package-lock) - add_custom_target( - cpm-update-package-lock COMMAND ${CMAKE_COMMAND} -E copy ${CPM_PACKAGE_LOCK_FILE} - ${CPM_ABSOLUTE_PACKAGE_LOCK_PATH} - ) - endif() - set(CPM_PACKAGE_LOCK_ENABLED true) - endif() -endmacro() - -# registers a package that has been added to CPM -function(CPMRegisterPackage PACKAGE VERSION) - list(APPEND CPM_PACKAGES ${PACKAGE}) - set(CPM_PACKAGES - ${CPM_PACKAGES} - CACHE INTERNAL "" - ) - set("CPM_PACKAGE_${PACKAGE}_VERSION" - ${VERSION} - CACHE INTERNAL "" - ) -endfunction() - -# retrieve the current version of the package to ${OUTPUT} -function(CPMGetPackageVersion PACKAGE OUTPUT) - set(${OUTPUT} - "${CPM_PACKAGE_${PACKAGE}_VERSION}" - PARENT_SCOPE - ) -endfunction() - -# declares a package in FetchContent_Declare -function(cpm_declare_fetch PACKAGE VERSION INFO) - if(${CPM_DRY_RUN}) - cpm_message(STATUS "${CPM_INDENT} Package not declared (dry run)") - return() - endif() - - FetchContent_Declare(${PACKAGE} ${ARGN}) -endfunction() - -# returns properties for a package previously defined by cpm_declare_fetch -function(cpm_get_fetch_properties PACKAGE) - if(${CPM_DRY_RUN}) - return() - endif() - - set(${PACKAGE}_SOURCE_DIR - "${CPM_PACKAGE_${PACKAGE}_SOURCE_DIR}" - PARENT_SCOPE - ) - set(${PACKAGE}_BINARY_DIR - "${CPM_PACKAGE_${PACKAGE}_BINARY_DIR}" - PARENT_SCOPE - ) -endfunction() - -function(cpm_store_fetch_properties PACKAGE source_dir binary_dir) - if(${CPM_DRY_RUN}) - return() - endif() - - set(CPM_PACKAGE_${PACKAGE}_SOURCE_DIR - "${source_dir}" - CACHE INTERNAL "" - ) - set(CPM_PACKAGE_${PACKAGE}_BINARY_DIR - "${binary_dir}" - CACHE INTERNAL "" - ) -endfunction() - -# adds a package as a subdirectory if viable, according to provided options -function( - cpm_add_subdirectory - PACKAGE - DOWNLOAD_ONLY - SOURCE_DIR - BINARY_DIR - EXCLUDE - SYSTEM - OPTIONS -) - - if(NOT DOWNLOAD_ONLY AND EXISTS ${SOURCE_DIR}/CMakeLists.txt) - set(addSubdirectoryExtraArgs "") - if(EXCLUDE) - list(APPEND addSubdirectoryExtraArgs EXCLUDE_FROM_ALL) - endif() - if("${SYSTEM}" AND "${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.25") - # https://cmake.org/cmake/help/latest/prop_dir/SYSTEM.html#prop_dir:SYSTEM - list(APPEND addSubdirectoryExtraArgs SYSTEM) - endif() - if(OPTIONS) - foreach(OPTION ${OPTIONS}) - cpm_parse_option("${OPTION}") - set(${OPTION_KEY} "${OPTION_VALUE}") - endforeach() - endif() - set(CPM_OLD_INDENT "${CPM_INDENT}") - set(CPM_INDENT "${CPM_INDENT} ${PACKAGE}:") - add_subdirectory(${SOURCE_DIR} ${BINARY_DIR} ${addSubdirectoryExtraArgs}) - set(CPM_INDENT "${CPM_OLD_INDENT}") - endif() -endfunction() - -# downloads a previously declared package via FetchContent and exports the variables -# `${PACKAGE}_SOURCE_DIR` and `${PACKAGE}_BINARY_DIR` to the parent scope -function(cpm_fetch_package PACKAGE populated) - set(${populated} - FALSE - PARENT_SCOPE - ) - if(${CPM_DRY_RUN}) - cpm_message(STATUS "${CPM_INDENT} Package ${PACKAGE} not fetched (dry run)") - return() - endif() - - FetchContent_GetProperties(${PACKAGE}) - - string(TOLOWER "${PACKAGE}" lower_case_name) - - if(NOT ${lower_case_name}_POPULATED) - FetchContent_Populate(${PACKAGE}) - set(${populated} - TRUE - PARENT_SCOPE - ) - endif() - - cpm_store_fetch_properties( - ${CPM_ARGS_NAME} ${${lower_case_name}_SOURCE_DIR} ${${lower_case_name}_BINARY_DIR} - ) - - set(${PACKAGE}_SOURCE_DIR - ${${lower_case_name}_SOURCE_DIR} - PARENT_SCOPE - ) - set(${PACKAGE}_BINARY_DIR - ${${lower_case_name}_BINARY_DIR} - PARENT_SCOPE - ) -endfunction() - -# splits a package option -function(cpm_parse_option OPTION) - string(REGEX MATCH "^[^ ]+" OPTION_KEY "${OPTION}") - string(LENGTH "${OPTION}" OPTION_LENGTH) - string(LENGTH "${OPTION_KEY}" OPTION_KEY_LENGTH) - if(OPTION_KEY_LENGTH STREQUAL OPTION_LENGTH) - # no value for key provided, assume user wants to set option to "ON" - set(OPTION_VALUE "ON") - else() - math(EXPR OPTION_KEY_LENGTH "${OPTION_KEY_LENGTH}+1") - string(SUBSTRING "${OPTION}" "${OPTION_KEY_LENGTH}" "-1" OPTION_VALUE) - endif() - set(OPTION_KEY - "${OPTION_KEY}" - PARENT_SCOPE - ) - set(OPTION_VALUE - "${OPTION_VALUE}" - PARENT_SCOPE - ) -endfunction() - -# guesses the package version from a git tag -function(cpm_get_version_from_git_tag GIT_TAG RESULT) - string(LENGTH ${GIT_TAG} length) - if(length EQUAL 40) - # GIT_TAG is probably a git hash - set(${RESULT} - 0 - PARENT_SCOPE - ) - else() - string(REGEX MATCH "v?([0123456789.]*).*" _ ${GIT_TAG}) - set(${RESULT} - ${CMAKE_MATCH_1} - PARENT_SCOPE - ) - endif() -endfunction() - -# guesses if the git tag is a commit hash or an actual tag or a branch name. -function(cpm_is_git_tag_commit_hash GIT_TAG RESULT) - string(LENGTH "${GIT_TAG}" length) - # full hash has 40 characters, and short hash has at least 7 characters. - if(length LESS 7 OR length GREATER 40) - set(${RESULT} - 0 - PARENT_SCOPE - ) - else() - if(${GIT_TAG} MATCHES "^[a-fA-F0-9]+$") - set(${RESULT} - 1 - PARENT_SCOPE - ) - else() - set(${RESULT} - 0 - PARENT_SCOPE - ) - endif() - endif() -endfunction() - -function(cpm_prettify_package_arguments OUT_VAR IS_IN_COMMENT) - set(oneValueArgs - NAME - FORCE - VERSION - GIT_TAG - DOWNLOAD_ONLY - GITHUB_REPOSITORY - GITLAB_REPOSITORY - BITBUCKET_REPOSITORY - GIT_REPOSITORY - SOURCE_DIR - FIND_PACKAGE_ARGUMENTS - NO_CACHE - SYSTEM - GIT_SHALLOW - EXCLUDE_FROM_ALL - SOURCE_SUBDIR - ) - set(multiValueArgs URL OPTIONS DOWNLOAD_COMMAND) - cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - - foreach(oneArgName ${oneValueArgs}) - if(DEFINED CPM_ARGS_${oneArgName}) - if(${IS_IN_COMMENT}) - string(APPEND PRETTY_OUT_VAR "#") - endif() - if(${oneArgName} STREQUAL "SOURCE_DIR") - string(REPLACE ${CMAKE_SOURCE_DIR} "\${CMAKE_SOURCE_DIR}" CPM_ARGS_${oneArgName} - ${CPM_ARGS_${oneArgName}} - ) - endif() - string(APPEND PRETTY_OUT_VAR " ${oneArgName} ${CPM_ARGS_${oneArgName}}\n") - endif() - endforeach() - foreach(multiArgName ${multiValueArgs}) - if(DEFINED CPM_ARGS_${multiArgName}) - if(${IS_IN_COMMENT}) - string(APPEND PRETTY_OUT_VAR "#") - endif() - string(APPEND PRETTY_OUT_VAR " ${multiArgName}\n") - foreach(singleOption ${CPM_ARGS_${multiArgName}}) - if(${IS_IN_COMMENT}) - string(APPEND PRETTY_OUT_VAR "#") - endif() - string(APPEND PRETTY_OUT_VAR " \"${singleOption}\"\n") - endforeach() - endif() - endforeach() - - if(NOT "${CPM_ARGS_UNPARSED_ARGUMENTS}" STREQUAL "") - if(${IS_IN_COMMENT}) - string(APPEND PRETTY_OUT_VAR "#") - endif() - string(APPEND PRETTY_OUT_VAR " ") - foreach(CPM_ARGS_UNPARSED_ARGUMENT ${CPM_ARGS_UNPARSED_ARGUMENTS}) - string(APPEND PRETTY_OUT_VAR " ${CPM_ARGS_UNPARSED_ARGUMENT}") - endforeach() - string(APPEND PRETTY_OUT_VAR "\n") - endif() - - set(${OUT_VAR} - ${PRETTY_OUT_VAR} - PARENT_SCOPE - ) - -endfunction() diff --git a/CommonLibSF/vcpkg.json b/CommonLibSF/vcpkg.json index 025ac001..d95d2ca2 100644 --- a/CommonLibSF/vcpkg.json +++ b/CommonLibSF/vcpkg.json @@ -2,11 +2,11 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "commonlibsf", "version-date": "2024-07-13", - "port-version": 0, "description": "A collaborative reverse-engineered library for Starfield.", "homepage": "https://github.com/Starfield-Reverse-Engineering/CommonLibSF", "license": "GPL-3.0-or-later", "supports": "windows & x64", + "builtin-baseline": "7a57b42f959ad138a5283477fe2e6c97a7cb852f", "dependencies": [ { "name": "vcpkg-cmake", @@ -19,4 +19,4 @@ "spdlog", "xbyak" ] -} \ No newline at end of file +} diff --git a/scripts/build-debug-clang-cl-cpm.bat b/scripts/build-debug-clang-cl-cpm.bat deleted file mode 100644 index 5bdd56b7..00000000 --- a/scripts/build-debug-clang-cl-cpm.bat +++ /dev/null @@ -1,3 +0,0 @@ -echo off -cmake -B "%~dp0/../build/build-debug-clang-cl-ninja-cpm" -S "%~dp0/../CommonLibSF" --preset=build-debug-clang-cl-ninja-cpm -cmake --build "%~dp0/../build/build-debug-clang-cl-ninja-cpm" --config Debug diff --git a/scripts/build-debug-clang-cl-test.bat b/scripts/build-debug-clang-cl-test.bat new file mode 100644 index 00000000..375042a1 --- /dev/null +++ b/scripts/build-debug-clang-cl-test.bat @@ -0,0 +1,3 @@ +echo off +cmake -B "%~dp0/../build/build-debug-clang-cl-ninja-test" -S "%~dp0/../CommonLibSF" --preset=build-debug-clang-cl-ninja -DSFSE_BUILD_TESTS=true +cmake --build "%~dp0/../build/build-debug-clang-cl-ninja-test" --config Debug diff --git a/scripts/build-debug-clang-cl-vcpkg.bat b/scripts/build-debug-clang-cl-vcpkg.bat deleted file mode 100644 index b96f9be6..00000000 --- a/scripts/build-debug-clang-cl-vcpkg.bat +++ /dev/null @@ -1,3 +0,0 @@ -echo off -cmake -B "%~dp0/../build/build-debug-clang-cl-ninja-vcpkg" -S "%~dp0/../CommonLibSF" --preset=build-debug-clang-cl-ninja-vcpkg -cmake --build "%~dp0/../build/build-debug-clang-cl-ninja-vcpkg" --config Debug diff --git a/scripts/build-debug-clang-cl.bat b/scripts/build-debug-clang-cl.bat new file mode 100644 index 00000000..97f69e4c --- /dev/null +++ b/scripts/build-debug-clang-cl.bat @@ -0,0 +1,3 @@ +echo off +cmake -B "%~dp0/../build/build-debug-clang-cl-ninja" -S "%~dp0/../CommonLibSF" --preset=build-debug-clang-cl-ninja +cmake --build "%~dp0/../build/build-debug-clang-cl-ninja" --config Debug diff --git a/scripts/build-debug-msvc-cpm-test.bat b/scripts/build-debug-msvc-cpm-test.bat deleted file mode 100644 index 6081b196..00000000 --- a/scripts/build-debug-msvc-cpm-test.bat +++ /dev/null @@ -1,3 +0,0 @@ -echo off -cmake -B "%~dp0/../build/build-debug-msvc-ninja-cpm-test" -S "%~dp0/../CommonLibSF" --preset=build-debug-msvc-ninja-cpm -DSFSE_BUILD_TESTS=true -cmake --build "%~dp0/../build/build-debug-msvc-ninja-cpm-test" --config Debug diff --git a/scripts/build-debug-msvc-cpm.bat b/scripts/build-debug-msvc-cpm.bat deleted file mode 100644 index 7237c539..00000000 --- a/scripts/build-debug-msvc-cpm.bat +++ /dev/null @@ -1,3 +0,0 @@ -echo off -cmake -B "%~dp0/../build/build-debug-msvc-ninja-cpm" -S "%~dp0/../CommonLibSF" --preset=build-debug-msvc-ninja-cpm -cmake --build "%~dp0/../build/build-debug-msvc-ninja-cpm" --config Debug diff --git a/scripts/build-debug-msvc-test.bat b/scripts/build-debug-msvc-test.bat new file mode 100644 index 00000000..ca84e489 --- /dev/null +++ b/scripts/build-debug-msvc-test.bat @@ -0,0 +1,3 @@ +echo off +cmake -B "%~dp0/../build/build-debug-msvc-ninja-test" -S "%~dp0/../CommonLibSF" --preset=build-debug-msvc-ninja -DSFSE_BUILD_TESTS=true +cmake --build "%~dp0/../build/build-debug-msvc-ninja-test" --config Debug diff --git a/scripts/build-debug-msvc-vcpkg.bat b/scripts/build-debug-msvc-vcpkg.bat deleted file mode 100644 index ba607a37..00000000 --- a/scripts/build-debug-msvc-vcpkg.bat +++ /dev/null @@ -1,3 +0,0 @@ -echo off -cmake -B "%~dp0/../build/build-debug-msvc-ninja-vcpkg" -S "%~dp0/../CommonLibSF" --preset=build-debug-msvc-ninja-vcpkg -cmake --build "%~dp0/../build/build-debug-msvc-ninja-vcpkg" --config Debug diff --git a/scripts/build-debug-msvc.bat b/scripts/build-debug-msvc.bat new file mode 100644 index 00000000..4d1447ed --- /dev/null +++ b/scripts/build-debug-msvc.bat @@ -0,0 +1,3 @@ +echo off +cmake -B "%~dp0/../build/build-debug-msvc-ninja" -S "%~dp0/../CommonLibSF" --preset=build-debug-msvc-ninja +cmake --build "%~dp0/../build/build-debug-msvc-ninja" --config Debug diff --git a/scripts/build-release-clang-cl-cpm-test.bat b/scripts/build-release-clang-cl-cpm-test.bat deleted file mode 100644 index 7110f1f2..00000000 --- a/scripts/build-release-clang-cl-cpm-test.bat +++ /dev/null @@ -1,3 +0,0 @@ -echo off -cmake -B "%~dp0/../build/build-release-clang-cl-ninja-cpm-test" -S "%~dp0/../CommonLibSF" --preset=build-release-clang-cl-ninja-cpm -DSFSE_BUILD_TESTS=true -cmake --build "%~dp0/../build/build-release-clang-cl-ninja-cpm-test" --config Release diff --git a/scripts/build-release-clang-cl-cpm.bat b/scripts/build-release-clang-cl-cpm.bat deleted file mode 100644 index 9bf7aa32..00000000 --- a/scripts/build-release-clang-cl-cpm.bat +++ /dev/null @@ -1,3 +0,0 @@ -echo off -cmake -B "%~dp0/../build/build-release-clang-cl-ninja-cpm" -S "%~dp0/../CommonLibSF" --preset=build-release-clang-cl-ninja-cpm -cmake --build "%~dp0/../build/build-release-clang-cl-ninja-cpm" --config Release diff --git a/scripts/build-release-clang-cl-test.bat b/scripts/build-release-clang-cl-test.bat new file mode 100644 index 00000000..d9c83782 --- /dev/null +++ b/scripts/build-release-clang-cl-test.bat @@ -0,0 +1,3 @@ +echo off +cmake -B "%~dp0/../build/build-release-clang-cl-ninja-test" -S "%~dp0/../CommonLibSF" --preset=build-release-clang-cl-ninja -DSFSE_BUILD_TESTS=true +cmake --build "%~dp0/../build/build-release-clang-cl-ninja-test" --config Release diff --git a/scripts/build-release-clang-cl-vcpkg.bat b/scripts/build-release-clang-cl-vcpkg.bat deleted file mode 100644 index a975c55d..00000000 --- a/scripts/build-release-clang-cl-vcpkg.bat +++ /dev/null @@ -1,3 +0,0 @@ -echo off -cmake -B "%~dp0/../build/build-release-clang-cl-ninja-vcpkg" -S "%~dp0/../CommonLibSF" --preset=build-release-clang-cl-ninja-vcpkg -cmake --build "%~dp0/../build/build-release-clang-cl-ninja-vcpkg" --config Release diff --git a/scripts/build-release-clang-cl.bat b/scripts/build-release-clang-cl.bat new file mode 100644 index 00000000..7db5a0d9 --- /dev/null +++ b/scripts/build-release-clang-cl.bat @@ -0,0 +1,3 @@ +echo off +cmake -B "%~dp0/../build/build-release-clang-cl-ninja" -S "%~dp0/../CommonLibSF" --preset=build-release-clang-cl-ninja +cmake --build "%~dp0/../build/build-release-clang-cl-ninja" --config Release diff --git a/scripts/build-release-msvc-cpm-test.bat b/scripts/build-release-msvc-cpm-test.bat deleted file mode 100644 index 8991981b..00000000 --- a/scripts/build-release-msvc-cpm-test.bat +++ /dev/null @@ -1,3 +0,0 @@ -echo off -cmake -B "%~dp0/../build/build-release-msvc-ninja-cpm-test" -S "%~dp0/../CommonLibSF" --preset=build-release-msvc-ninja-cpm -DSFSE_BUILD_TESTS=true -cmake --build "%~dp0/../build/build-release-msvc-ninja-cpm-test" --config Release diff --git a/scripts/build-release-msvc-cpm.bat b/scripts/build-release-msvc-cpm.bat deleted file mode 100644 index 30426e5a..00000000 --- a/scripts/build-release-msvc-cpm.bat +++ /dev/null @@ -1,3 +0,0 @@ -echo off -cmake -B "%~dp0/../build/build-release-msvc-ninja-cpm" -S "%~dp0/../CommonLibSF" --preset=build-release-msvc-ninja-cpm -cmake --build "%~dp0/../build/build-release-msvc-ninja-cpm" --config Release diff --git a/scripts/build-release-msvc-test.bat b/scripts/build-release-msvc-test.bat new file mode 100644 index 00000000..51d65d84 --- /dev/null +++ b/scripts/build-release-msvc-test.bat @@ -0,0 +1,3 @@ +echo off +cmake -B "%~dp0/../build/build-release-msvc-ninja-test" -S "%~dp0/../CommonLibSF" --preset=build-release-msvc-ninja -DSFSE_BUILD_TESTS=true +cmake --build "%~dp0/../build/build-release-msvc-ninja-test" --config Release diff --git a/scripts/build-release-msvc-vcpkg.bat b/scripts/build-release-msvc-vcpkg.bat deleted file mode 100644 index 77b4db56..00000000 --- a/scripts/build-release-msvc-vcpkg.bat +++ /dev/null @@ -1,3 +0,0 @@ -echo off -cmake -B "%~dp0/../build/build-release-msvc-ninja-vcpkg" -S "%~dp0/../CommonLibSF" --preset=build-release-msvc-ninja-vcpkg -cmake --build "%~dp0/../build/build-release-msvc-ninja-vcpkg" --config Release diff --git a/scripts/build-release-msvc.bat b/scripts/build-release-msvc.bat new file mode 100644 index 00000000..523710ca --- /dev/null +++ b/scripts/build-release-msvc.bat @@ -0,0 +1,3 @@ +echo off +cmake -B "%~dp0/../build/build-release-msvc-ninja" -S "%~dp0/../CommonLibSF" --preset=build-release-msvc-ninja +cmake --build "%~dp0/../build/build-release-msvc-ninja" --config Release diff --git a/scripts/make-sln-clang-cl-cpm.bat b/scripts/make-sln-clang-cl-cpm.bat deleted file mode 100644 index 0a3a01ee..00000000 --- a/scripts/make-sln-clang-cl-cpm.bat +++ /dev/null @@ -1,2 +0,0 @@ -echo off -cmake -B "%~dp0/../build/build-debug-clang-cl-msvc-cpm" -S "%~dp0/../CommonLibSF" --preset=build-debug-clang-cl-msvc-cpm diff --git a/scripts/make-sln-clang-cl-vcpkg.bat b/scripts/make-sln-clang-cl-vcpkg.bat deleted file mode 100644 index a540eda3..00000000 --- a/scripts/make-sln-clang-cl-vcpkg.bat +++ /dev/null @@ -1,2 +0,0 @@ -echo off -cmake -B "%~dp0/../build/build-debug-clang-cl-msvc-vcpkg" -S "%~dp0/../CommonLibSF" --preset=build-debug-clang-cl-msvc-vcpkg diff --git a/scripts/make-sln-clang-cl.bat b/scripts/make-sln-clang-cl.bat new file mode 100644 index 00000000..87b5bb2b --- /dev/null +++ b/scripts/make-sln-clang-cl.bat @@ -0,0 +1,2 @@ +echo off +cmake -B "%~dp0/../build/build-debug-clang-cl-msvc" -S "%~dp0/../CommonLibSF" --preset=build-debug-clang-cl-msvc diff --git a/scripts/make-sln-msvc-cpm.bat b/scripts/make-sln-msvc-cpm.bat deleted file mode 100644 index 5926617f..00000000 --- a/scripts/make-sln-msvc-cpm.bat +++ /dev/null @@ -1,2 +0,0 @@ -echo off -cmake -B "%~dp0/../build/build-debug-msvc-msvc-cpm" -S "%~dp0/../CommonLibSF" --preset=build-debug-msvc-msvc-cpm diff --git a/scripts/make-sln-msvc-vcpkg.bat b/scripts/make-sln-msvc-vcpkg.bat deleted file mode 100644 index 479fbc9c..00000000 --- a/scripts/make-sln-msvc-vcpkg.bat +++ /dev/null @@ -1,2 +0,0 @@ -echo off -cmake -B "%~dp0/../build/build-debug-msvc-msvc-vcpkg" -S "%~dp0/../CommonLibSF" --preset=build-debug-msvc-msvc-vcpkg diff --git a/scripts/make-sln-msvc.bat b/scripts/make-sln-msvc.bat new file mode 100644 index 00000000..438de253 --- /dev/null +++ b/scripts/make-sln-msvc.bat @@ -0,0 +1,2 @@ +echo off +cmake -B "%~dp0/../build/build-debug-msvc-msvc" -S "%~dp0/../CommonLibSF" --preset=build-debug-msvc-msvc