[ros-diffs] [sir_richard] 48438: [CMAKE]: Fix CRT.

sir_richard at svn.reactos.org sir_richard at svn.reactos.org
Tue Aug 3 21:38:40 UTC 2010


Author: sir_richard
Date: Tue Aug  3 21:38:39 2010
New Revision: 48438

URL: http://svn.reactos.org/svn/reactos?rev=48438&view=rev
Log:
[CMAKE]: Fix CRT.

Modified:
    branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt

Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt?rev=48438&r1=48437&r2=48438&view=diff
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Tue Aug  3 21:38:39 2010
@@ -1,13 +1,14 @@
 
-include_directories(.)
 include_directories(./include)
+
+add_definitions(-D_CRTBLD)
 
 file(GLOB_RECURSE CRT_SOURCE "*.c")
 LIST(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/stdio/findgen.c)
 LIST(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strtold.c)
 
 add_library(crt ${CRT_SOURCE})
-add_definitions(-D__MINGW_IMPORT=extern -DUSE_MSVCRT_PREFIX -D_MSVCRT_LIB_ -D_MSVCRT_ -D_MT -D_CRTBLD)
+set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT)
 add_dependencies(crt psdk)
 
 if(ARCH MATCHES i386)
@@ -114,6 +115,5 @@
 endif()
 
 add_library(libcntpr ${LIBCNTPR_SOURCE})
-remove_definitions(-D__MINGW_IMPORT=extern -DUSE_MSVCRT_PREFIX -D_MSVCRT_LIB_ -D_MSVCRT_ -D_MT -D_CRTBLD)
-add_definitions(-DNO_RTL_INLINES -D_NTSYSTEM_ -D_NTDLLBUILD_ -D_LIBCNT_ -D__CRT__NO_INLINE)
+set_property(TARGET libcntpr PROPERTY COMPILE_DEFINITIONS NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE)
 add_dependencies(libcntpr psdk)




More information about the Ros-diffs mailing list