From cac01ad6eb99b79a988849c6ea0d284333b7813b Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Fri, 28 Jan 2011 13:41:55 +0000 Subject: [PATCH] [CMAKE] Fix crt/bootcdregtest regression, due to _USER32_WSPRINTF. add_definitions does not apply to target, but current directory. svn path=/branches/cmake-bringup/; revision=50535 --- lib/sdk/crt/CMakeLists.txt | 13 +------------ lib/sdk/crt/printf/CMakeLists.txt | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 lib/sdk/crt/printf/CMakeLists.txt diff --git a/lib/sdk/crt/CMakeLists.txt b/lib/sdk/crt/CMakeLists.txt index 053ed01b4fc..93850903370 100644 --- a/lib/sdk/crt/CMakeLists.txt +++ b/lib/sdk/crt/CMakeLists.txt @@ -626,15 +626,4 @@ if(MSVC) add_dependencies(msvcsup psdk buildno_header asm) endif() -add_definitions(-D_USER32_WSPRINTF) -add_library(user32_wsprintf - printf/streamout.c - printf/wstreamout.c - printf/wsprintfA.c - printf/wsprintfW.c - printf/wvsprintfA.c - printf/wvsprintfW.c - printf/wvsnprintfA.c - printf/wvsnprintfW.c - string/mbstowcs_nt.c - string/wcstombs_nt.c) +add_subdirectory(printf) \ No newline at end of file diff --git a/lib/sdk/crt/printf/CMakeLists.txt b/lib/sdk/crt/printf/CMakeLists.txt new file mode 100644 index 00000000000..9f7369f697d --- /dev/null +++ b/lib/sdk/crt/printf/CMakeLists.txt @@ -0,0 +1,16 @@ + +include_directories(.. ../include) + +add_definitions(-D_USER32_WSPRINTF) + +add_library(user32_wsprintf + streamout.c + wstreamout.c + wsprintfA.c + wsprintfW.c + wvsprintfA.c + wvsprintfW.c + wvsnprintfA.c + wvsnprintfW.c + ../string/mbstowcs_nt.c + ../string/wcstombs_nt.c)