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]> --- 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 b580960..c71fb2c 100644 --- a/src/waffle/CMakeLists.txt +++ b/src/waffle/CMakeLists.txt @@ -255,7 +255,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.1.3 _______________________________________________ waffle mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/waffle
