diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:14:42 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:14:42 -0700 |
| commit | a8465b738e5a1f346ece58ea6f82612bcd6659d2 (patch) | |
| tree | b755540a5d7d2cc988eabc7ac594e6abd9da29d1 /cmake | |
| parent | 6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3 (diff) | |
| parent | 9bbc4b1fab8262958c172f2d8e87b486c950a051 (diff) | |
| download | protobuf-a8465b738e5a1f346ece58ea6f82612bcd6659d2.tar.gz protobuf-a8465b738e5a1f346ece58ea6f82612bcd6659d2.tar.bz2 protobuf-a8465b738e5a1f346ece58ea6f82612bcd6659d2.zip | |
Merge master branch.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/tests.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cmake/tests.cmake b/cmake/tests.cmake index b77a5ebe..001b4200 100644 --- a/cmake/tests.cmake +++ b/cmake/tests.cmake @@ -208,6 +208,13 @@ endif() if(MINGW) set_source_files_properties(${tests_files} PROPERTIES COMPILE_FLAGS "-Wno-narrowing") + + # required for tests on MinGW Win64 + if (CMAKE_SIZEOF_VOID_P EQUAL 8) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--stack,16777216") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj") + endif() + endif() add_executable(tests ${tests_files} ${common_test_files} ${tests_proto_files} ${lite_test_proto_files}) |