diff --git a/.github/workflows/ci-build-test.yml b/.github/workflows/ci-build-test.yml index 367bdb763f9..365709b475c 100644 --- a/.github/workflows/ci-build-test.yml +++ b/.github/workflows/ci-build-test.yml @@ -126,7 +126,7 @@ jobs: run: ( cd __build && ctest --output-junit test.xml -j 40 -R job_dagman_vars ) winbuild: - runs-on: windows-2022 + runs-on: windows-latest steps: - name: Checkout code uses: actions/checkout@v6 diff --git a/CMakeLists.txt b/CMakeLists.txt index 0eb58ac152e..8cbac5e29c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,3 +170,103 @@ endif() ########################################################################## # Must in included post *install targets include ( CPack ) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/cmake/CondorPackageConfig.cmake b/build/cmake/CondorPackageConfig.cmake index 018083d9d27..caec089a05c 100644 --- a/build/cmake/CondorPackageConfig.cmake +++ b/build/cmake/CondorPackageConfig.cmake @@ -305,8 +305,6 @@ elseif ( ${OS_NAME} MATCHES "^WIN" ) set (MSVCVER vc143) set (MSVCVERNUM 14.3) endif() - else() - message(FATAL_ERROR "unsupported compiler version") endif() # look for the all important C-runtime