From d6f1cb454cc24af2fe327a06bc936997f5dd4452 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 9 Feb 2011 12:09:21 +0000 Subject: [PATCH] [CMAKE] - Apply the proper definition to user32_wsprintf using target properties. svn path=/branches/cmake-bringup/; revision=50630 --- lib/sdk/crt/CMakeLists.txt | 14 +++++++++++++- lib/sdk/crt/printf/CMakeLists.txt | 16 ---------------- 2 files changed, 13 insertions(+), 17 deletions(-) delete mode 100644 lib/sdk/crt/printf/CMakeLists.txt diff --git a/lib/sdk/crt/CMakeLists.txt b/lib/sdk/crt/CMakeLists.txt index 8c65c6762d6..2f04b0a5e00 100644 --- a/lib/sdk/crt/CMakeLists.txt +++ b/lib/sdk/crt/CMakeLists.txt @@ -628,4 +628,16 @@ if(MSVC) add_dependencies(msvcsup psdk buildno_header asm) endif() -add_subdirectory(printf) +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) + +set_property(TARGET user32_wsprintf PROPERTY COMPILE_DEFINITIONS _USER32_WSPRINTF) diff --git a/lib/sdk/crt/printf/CMakeLists.txt b/lib/sdk/crt/printf/CMakeLists.txt deleted file mode 100644 index 9f7369f697d..00000000000 --- a/lib/sdk/crt/printf/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ - -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)