[waffle] [PATCH 47/53] cmake: ensure waffle-static name differs from the shared one
Emil Velikov
emil.l.velikov at gmail.com
Sun Nov 9 16:10:25 PST 2014
A lovely note which I've complete forgot.
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
On 09/11/14 22:58, Emil Velikov wrote:
> 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 <chad.versace at linux.intel.com>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
> 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}"
> )
>
> # ----------------------------------------------------------------------------
>
More information about the waffle
mailing list