diff options
| author | onqtam <vik.kirilov@gmail.com> | 2016-09-10 02:37:47 +0300 |
|---|---|---|
| committer | onqtam <vik.kirilov@gmail.com> | 2016-09-21 15:46:12 +0300 |
| commit | 7505ba19404095a7f7012fccde83760ba3f18f1f (patch) | |
| tree | 3c90827a10dc5f0ed3ee5d51bc026b9bd40d210d /examples/exe_with_static_libs/doctest_force_link_static_lib_in_target.cmake | |
| parent | c7aaa969c479ecc80fea26f800fcbf603e8b8112 (diff) | |
hopefully fixing the travis builds...
Diffstat (limited to 'examples/exe_with_static_libs/doctest_force_link_static_lib_in_target.cmake')
| -rw-r--r-- | examples/exe_with_static_libs/doctest_force_link_static_lib_in_target.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/exe_with_static_libs/doctest_force_link_static_lib_in_target.cmake b/examples/exe_with_static_libs/doctest_force_link_static_lib_in_target.cmake index 775276f..14d78e3 100644 --- a/examples/exe_with_static_libs/doctest_force_link_static_lib_in_target.cmake +++ b/examples/exe_with_static_libs/doctest_force_link_static_lib_in_target.cmake @@ -48,7 +48,7 @@ function(doctest_force_link_static_lib_in_target target lib) math(EXPR curr_dummy "${curr_dummy} + 1") set(curr_dummy_header ${dummy_dir}/dummy_${curr_dummy}.h) - file(WRITE ${curr_dummy_header} "${DLL_PRIVATE}namespace doctest { namespace detail { DLL_PRIVATE int dummy_for_${LIB_NAME}_${curr_dummy}(); DLL_PRIVATE int dummy_for_${LIB_NAME}_${curr_dummy}() { return ${curr_dummy}; } } }") + file(WRITE ${curr_dummy_header} "${DLL_PRIVATE}namespace doctest { namespace detail { DLL_PRIVATE int dummy_for_${LIB_NAME}_${curr_dummy}(); DLL_PRIVATE int dummy_for_${LIB_NAME}_${curr_dummy}() { return ${curr_dummy}; } } }\n") doctest_include_file_in_sources(${curr_dummy_header} ${src}) endif() endforeach() @@ -67,7 +67,7 @@ function(doctest_force_link_static_lib_in_target target lib) foreach(curr_dummy RANGE 1 ${total_dummies}) file(APPEND ${dummy_header} " res += dummy_for_${LIB_NAME}_${curr_dummy}();\n") endforeach() - file(APPEND ${dummy_header} " return res;\n}\n\n} } // namespaces") + file(APPEND ${dummy_header} " return res;\n}\n\n} } // namespaces\n") # set the dummy header property so we don't recreate the dummy headers the next time this macro is called for this library set_target_properties(${lib} PROPERTIES DOCTEST_DUMMY_HEADER ${dummy_header}) |