diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-19 18:19:17 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-19 18:19:28 (GMT) |
| commit | 555f234fa28b1dde4edfaca644de680391941cd4 (patch) | |
| tree | dbd08f73ef344a3d294f3bc4e2731e7abb367087 /Tests | |
| parent | caba59b8faadaf971f0a16a8abc44c9e50b198f3 (diff) | |
| parent | 1bfe37201a0b5fb25f775ec34e25a2a184529489 (diff) | |
| download | CMake-555f234fa28b1dde4edfaca644de680391941cd4.zip CMake-555f234fa28b1dde4edfaca644de680391941cd4.tar.gz CMake-555f234fa28b1dde4edfaca644de680391941cd4.tar.bz2 | |
Merge topic 'solarisEmptyFileFix'
1bfe3720 Tests: Ensure Solaris linker never sees empty contents
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !860
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeCommands/target_link_libraries/empty.cpp | 4 | ||||
| -rw-r--r-- | Tests/Wrapping/fakefluid.cxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Tests/CMakeCommands/target_link_libraries/empty.cpp b/Tests/CMakeCommands/target_link_libraries/empty.cpp index ab32cf6..a6ecef8 100644 --- a/Tests/CMakeCommands/target_link_libraries/empty.cpp +++ b/Tests/CMakeCommands/target_link_libraries/empty.cpp @@ -1 +1,3 @@ -// No content +// Solaris needs non-empty content so ensure +// we have at least one symbol +int Solaris_requires_a_symbol_here = 0; diff --git a/Tests/Wrapping/fakefluid.cxx b/Tests/Wrapping/fakefluid.cxx index 02c0c52..a118bbd 100644 --- a/Tests/Wrapping/fakefluid.cxx +++ b/Tests/Wrapping/fakefluid.cxx @@ -6,7 +6,9 @@ int main(int ac, char** av) if (strcmp(av[i], "-o") == 0 || strcmp(av[i], "-h") == 0) { fprintf(stdout, "fakefluid is creating file \"%s\"\n", av[i + 1]); FILE* file = fopen(av[i + 1], "w"); - fprintf(file, "// hello\n"); + fprintf(file, "// Solaris needs non-empty content so ensure\n" + "// we have at least one symbol\n" + "int Solaris_requires_a_symbol_here = 0;\n"); fclose(file); } } |