-
Notifications
You must be signed in to change notification settings - Fork 121
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
base: master
Are you sure you want to change the base?
Conversation
test/CMakeLists.txt
Outdated
|
||
endif(CODE_COVERAGE) | ||
endif(CODE_COVERAGE) | ||
endif() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add NOT MSVC here
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
.github/workflows/cmake.yml
Outdated
@@ -2,10 +2,7 @@ name: CMake | |||
|
|||
on: | |||
push: | |||
branches: [ master ] |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reverted
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 )