diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 86869c3da..e3c8942d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -119,8 +119,7 @@ jobs: C:/ProgramData/chocolatey/lib/Graphviz C:/Program*/doxygen/ C:/Program*/Graphviz/ - C:/Python*/ - key: cache-chocolatey${{ matrix.config.WIN_ARCH }}-zlib-1-3-python312 + key: cache-chocolatey${{ matrix.config.WIN_ARCH }}-zlib-1-3 - name: Setup MSVC Shell For Windows if: runner.os == 'Windows' @@ -133,7 +132,7 @@ jobs: if [ "$RUNNER_OS" == "Linux" ]; then sudo apt-get update > /dev/null && sudo apt-get install -qqq doxygen graphviz devscripts libxkbcommon-x11-0 ninja-build clang > /dev/null elif [ "$RUNNER_OS" == "Windows" ]; then - choco install ninja doxygen.install graphviz python312 + choco install ninja doxygen.install graphviz else brew install doxygen graphviz ninja fi diff --git a/CMakeLists.txt b/CMakeLists.txt index 1cc864a9e..4784cde65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,9 +5,9 @@ cmake_minimum_required(VERSION 3.21) cmake_policy(SET CMP0074 NEW) #Set The Current Version Number to use as fallback if GIT Fails. -set(FF7TK_VERSION_MAJOR 0) -set(FF7TK_VERSION_MINOR 83) -set(FF7TK_VERSION_PATCH 3) +set(FF7TK_VERSION_MAJOR 1) +set(FF7TK_VERSION_MINOR 0) +set(FF7TK_VERSION_PATCH 0) set(FF7TK_VERSION_TWEAK 0) # Get the version from git if it's a git repository if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) diff --git a/cmake/ff7tkMacros.cmake b/cmake/ff7tkMacros.cmake index 1cc1329ee..a9f4b9d2d 100644 --- a/cmake/ff7tkMacros.cmake +++ b/cmake/ff7tkMacros.cmake @@ -107,7 +107,7 @@ macro(MAKE_LIBRARY LIB_TARGET HEADER_INSTALL_DIR) write_basic_package_version_file( ${CMAKE_CURRENT_BINARY_DIR}/${LIB_TARGET}ConfigVersion.cmake VERSION ${PROJECT_VERSION} - COMPATIBILITY SameMinorVersion + COMPATIBILITY SameMajorVersion ) configure_package_config_file( ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_TARGET}Config.cmake.in