Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#486 Attempts to fix cmake build on windows, msvc #487

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

OlekRaymond
Copy link
Contributor

A good pull request has the following information:

  • A reference to a related issue in your repository.
    Closes issue Windows build  #486.

  • A description of the changes proposed in the pull request.
    Changes in workflow file to not include windows path separators in call to CMake.
    Changes in CMake files to not use gcc/clang arguments to compiler invocation.

  • @mentions of the person or team responsible for reviewing proposed changes. ( optional )


endif(CODE_COVERAGE)
endif(CODE_COVERAGE)
endif()
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add NOT MSVC here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@@ -41,7 +38,7 @@ jobs:
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: |
if [ ${{ matrix.os }} == 'windows-latest' ]; then
cmake -DTEST=ON -Dgtest_disable_pthreads=ON -B ${{github.workspace}}/build
cmake -DTEST=ON -Dgtest_disable_pthreads=ON -B ./build
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this correct? Could you explain why?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a comment to explain.

@@ -2,10 +2,7 @@ name: CMake

on:
push:
branches: [ master ]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am unsure that removing the branch restriction is right - do we know if the team uses direct commit to master or TBD?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted

@OlekRaymond OlekRaymond requested a review from sfkleach January 7, 2025 20:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants