eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2331 from adambadura:CMakeCorrection

Browse Source 
PiperOrigin-RevId: 260509310
This commit is contained in:
Gennadiy Civil 2019-07-29 11:58:34 -04:00
commit fe9fb64edf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
googlemock/CMakeLists.txt
View File

@ -142,7 +142,7 @@ if (gmock_build_tests)
"$project_bin = \"${CMAKE_BINARY_DIR}/bin/$<CONFIG>\" "$project_bin = \"${CMAKE_BINARY_DIR}/bin/$<CONFIG>\"
$env:Path = \"$project_bin;$env:Path\" $env:Path = \"$project_bin;$env:Path\"
& $args") & $args")
elseif (MINGW) elseif (MINGW OR CYGWIN)
file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/RunTest.ps1" file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/RunTest.ps1"
CONTENT CONTENT
"$project_bin = (cygpath --windows ${CMAKE_BINARY_DIR}/bin) "$project_bin = (cygpath --windows ${CMAKE_BINARY_DIR}/bin)
@ -162,7 +162,7 @@ $env:Path = \"$project_bin;$env:Path\"
cxx_test(gmock-generated-matchers_test gmock_main) cxx_test(gmock-generated-matchers_test gmock_main)
cxx_test(gmock-internal-utils_test gmock_main) cxx_test(gmock-internal-utils_test gmock_main)
cxx_test(gmock-matchers_test gmock_main) cxx_test(gmock-matchers_test gmock_main)
if (MINGW) if (MINGW OR CYGWIN)
target_compile_options(gmock-matchers_test PRIVATE "-Wa,-mbig-obj") target_compile_options(gmock-matchers_test PRIVATE "-Wa,-mbig-obj")
endif() endif()
cxx_test(gmock-more-actions_test gmock_main) cxx_test(gmock-more-actions_test gmock_main)

2
googletest/CMakeLists.txt
View File

@ -188,7 +188,7 @@ if (gtest_build_tests)
"$project_bin = \"${CMAKE_BINARY_DIR}/bin/$<CONFIG>\" "$project_bin = \"${CMAKE_BINARY_DIR}/bin/$<CONFIG>\"
$env:Path = \"$project_bin;$env:Path\" $env:Path = \"$project_bin;$env:Path\"
& $args") & $args")
elseif (MINGW) elseif (MINGW OR CYGWIN)
file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/RunTest.ps1" file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/RunTest.ps1"
CONTENT CONTENT
"$project_bin = (cygpath --windows ${CMAKE_BINARY_DIR}/bin) "$project_bin = (cygpath --windows ${CMAKE_BINARY_DIR}/bin)