From 7505ba19404095a7f7012fccde83760ba3f18f1f Mon Sep 17 00:00:00 2001 From: onqtam Date: Sat, 10 Sep 2016 02:37:47 +0300 Subject: hopefully fixing the travis builds... --- .../doctest_force_link_static_lib_in_target.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/exe_with_static_libs/doctest_force_link_static_lib_in_target.cmake') 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}) -- cgit v1.2.3