In our current state 'make check/check-func' will succeed, but plain 'make all' will fail. This is due to naming colision when building for Windows, as RUNTIME, LIBRARY and ARCHIVE have different meanings between Windows and everyone else. Essentially the waffle.lib from the shared library will clash with the one for static waffle.
Cc: Chad Versace <[email protected]> Signed-off-by: Emil Velikov <[email protected]> --- Note to self: always test everything - not just the thing that is likely to break. Fwiw we can squash this patch with 'cmake: Set default location for all artifacts to top-level directories' as it essentially introduces the regression. -Emil src/waffle/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt index 091e4e9..5f37aa0 100644 --- a/src/waffle/CMakeLists.txt +++ b/src/waffle/CMakeLists.txt @@ -241,7 +241,7 @@ target_link_libraries(waffle_static ${waffle_libdeps}) set_target_properties(waffle_static PROPERTIES - OUTPUT_NAME "waffle-${waffle_major_version}" + OUTPUT_NAME "waffle-static-${waffle_major_version}" ) # ---------------------------------------------------------------------------- -- 2.0.2 _______________________________________________ waffle mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/waffle
