[ros-diffs] [tfaber] 53931: [CMAKE] - Use the new macros for link flags and compile definitions some more. No semantic changes

Author: tfaber
Date: Sun Oct  2 18:59:33 2011
New Revision: 53931

URL: http://svn.reactos.org/svn/reactos?rev=53931&view=rev
Log:
[CMAKE]
- Use the new macros for link flags and compile definitions some more. No semantic
changes

Modified:
    trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt
    trunk/reactos/cmake/CMakeMacros.cmake
    trunk/reactos/cmake/compilerflags.cmake
    trunk/reactos/cmake/gcc.cmake
    trunk/reactos/cmake/msvc.cmake
    trunk/reactos/dll/directx/ksproxy/CMakeLists.txt
    trunk/reactos/dll/nls/idndl/CMakeLists.txt
    trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt
    trunk/reactos/drivers/video/displays/framebuf_new/framebuf_new.rbuild
    trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt
    trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt
    trunk/reactos/hal/halx86/CMakeLists.txt
    trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt
    trunk/reactos/lib/sdk/crt/CMakeLists.txt
    trunk/reactos/lib/sdk/crt/crt.cmake
    trunk/reactos/lib/sdk/crt/libcntpr.cmake
    trunk/reactos/lib/sdk/crt/msvcrtex.cmake

Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Oct  2 18:59:33
2011
@@ -166,10 +166,10 @@
 add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE})
 
 if(NOT MSVC)
-    set_target_properties(freeldr_pe PROPERTIES LINK_FLAGS
"-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk")
+    add_target_link_flags(freeldr_pe
"-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk")
     set_target_properties(freeldr_pe_dbg PROPERTIES LINK_FLAGS
"-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk")
 else()
-    set_target_properties(freeldr_pe PROPERTIES LINK_FLAGS "/ignore:4078
/ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW
/MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text
/SUBSYSTEM:BOOT_APPLICATION")
+    add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED
/ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text
/MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION")
     set_target_properties(freeldr_pe_dbg PROPERTIES LINK_FLAGS "/ignore:4078
/ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW
/MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text
/SUBSYSTEM:BOOT_APPLICATION")
 endif()
 
@@ -229,12 +229,13 @@
 add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}
${SETUPLDR_SOURCE})
 
 if(NOT MSVC)
-    set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS
"-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk"
COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP")
+    add_target_link_flags(setupldr_pe
"-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk")
     set_target_properties(setupldr_pe_dbg PROPERTIES LINK_FLAGS
"-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk"
COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP")
 else()
-    set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "/ignore:4078
/ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW
/MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text
/SUBSYSTEM:BOOT_APPLICATION" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP")
+    add_target_link_flags(setupldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED
/ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text
/MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION")
     set_target_properties(setupldr_pe_dbg PROPERTIES LINK_FLAGS "/ignore:4078
/ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW
/MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text
/SUBSYSTEM:BOOT_APPLICATION" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP")
 endif()
+add_target_compile_definitions(setupldr_pe FREELDR_REACTOS_SETUP)
 
 set_image_base(setupldr_pe 0x10000)
 set_subsystem(setupldr_pe native)

Modified: trunk/reactos/cmake/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re…
==============================================================================
--- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sun Oct  2 18:59:33 2011
@@ -233,7 +233,7 @@
 function(add_importlibs _module)
     add_dependency_node(${_module})
     foreach(LIB ${ARGN})
-        if ("${LIB}" MATCHES "msvcrt")
+        if("${LIB}" MATCHES "msvcrt")
             add_target_compile_definitions(${_module} _DLL __USE_CRTIMP)
             target_link_libraries(${_module} msvcrtex)
         endif()

Modified: trunk/reactos/cmake/compilerflags.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/compilerflags.cmake?…
==============================================================================
--- trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] Sun Oct  2 18:59:33 2011
@@ -8,11 +8,11 @@
     list(APPEND _list_properties COMPILE_DEFINITIONS INCLUDE_DIRECTORIES)
     set(_newvalue "")
     get_target_property(_oldvalue ${_module} ${_propname})
-    if (_oldvalue)
+    if(_oldvalue)
         set(_newvalue ${_oldvalue})
     endif()
     list(FIND _list_properties ${_propname} _list_index)
-    if (NOT _list_index EQUAL -1)
+    if(NOT _list_index EQUAL -1)
         # list property
         list(APPEND _newvalue ${ARGN})
     else()
@@ -37,7 +37,7 @@
 #  add_target_compile_definitions(mymodule WIN32 _WIN32 INLINE=inline)
 #  add_target_include_directories(mymodule include ../include)
 function(add_compile_flags _flags)
-    if (${ARGC} GREATER 1)
+    if(${ARGC} GREATER 1)
         message(STATUS "Excess arguments to add_compile_flags! Args ${ARGN}")
     endif()
     # Adds the compiler flag to both CMAKE_C_FLAGS and CMAKE_CXX_FLAGS
@@ -47,14 +47,14 @@
 endfunction()
 
 function(add_target_compile_flags _module _flags)
-    if (${ARGC} GREATER 2)
+    if(${ARGC} GREATER 2)
         message(STATUS "Excess arguments to add_target_compile_flags! Module
${_module}, args ${ARGN}")
     endif()
     add_target_property(${_module} COMPILE_FLAGS ${_flags})
 endfunction()
 
 function(add_target_link_flags _module _flags)
-    if (${ARGC} GREATER 2)
+    if(${ARGC} GREATER 2)
         message(STATUS "Excess arguments to add_target_link_flags! Module
${_module}, args ${ARGN}")
     endif()
     add_target_property(${_module} LINK_FLAGS ${_flags})

Modified: trunk/reactos/cmake/gcc.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=53931&…
==============================================================================
--- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Oct  2 18:59:33 2011
@@ -118,7 +118,7 @@
         add_target_link_flags(${MODULE} "-Wl,-entry,0")
     elseif(ARCH MATCHES i386)
         set(_entrysymbol _${ENTRYPOINT})
-        if (${ARGC} GREATER 2)
+        if(${ARGC} GREATER 2)
             set(_entrysymbol ${_entrysymbol}@${ARGV2})
         endif()
         add_target_link_flags(${MODULE} "-Wl,-entry,${_entrysymbol}")
@@ -191,7 +191,7 @@
         endif()
     endif()
 
-    if (${_extension} STREQUAL ".spec")
+    if(${_extension} STREQUAL ".spec")
 
         # Normal importlib creation
         add_custom_command(
@@ -276,7 +276,7 @@
 
         # This gets any specific definitions that were added with set-target-property
         get_target_property(_target_defs ${_target_name} COMPILE_DEFINITIONS)
-        if (_target_defs)
+        if(_target_defs)
             foreach(item ${_target_defs})
                 list(APPEND ${_out_compile_flags} -D${item})
             endforeach()

Modified: trunk/reactos/cmake/msvc.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=53931…
==============================================================================
--- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Oct  2 18:59:33 2011
@@ -64,7 +64,7 @@
         add_target_link_flags(${_module} "/NOENTRY")
     elseif(ARCH MATCHES i386)
         set(_entrysymbol ${_entrypoint})
-        if (${ARGC} GREATER 2)
+        if(${ARGC} GREATER 2)
             set(_entrysymbol ${_entrysymbol}@${ARGV2})
         endif()
         add_target_link_flags(${_module} "/ENTRY:${_entrysymbol}")

Modified: trunk/reactos/dll/directx/ksproxy/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/CMakeL…
==============================================================================
--- trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Sun Oct  2 18:59:33
2011
@@ -31,10 +31,10 @@
 set_entrypoint(ksproxy 0)
 set_target_properties(ksproxy PROPERTIES SUFFIX ".ax")
 if(MSVC)
-    set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "/GR-")
+    add_target_compile_flags(ksproxy "/GR-")
 else()
     #FIXME : can't build if this is enabled, check if this is needed
-    #set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "-fno-exceptions
-fno-rtti")
+    #add_target_compile_flags(ksproxy "-fno-exceptions -fno-rtti")
     target_link_libraries(ksproxy -lsupc++ -lgcc -lmingw32 oldnames)
 endif()
 

Modified: trunk/reactos/dll/nls/idndl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/idndl/CMakeLists.t…
==============================================================================
--- trunk/reactos/dll/nls/idndl/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/nls/idndl/CMakeLists.txt [iso-8859-1] Sun Oct  2 18:59:33 2011
@@ -11,7 +11,7 @@
 set_entrypoint(idndl 0)
 
 if(NOT MSVC)
-    set_target_properties(idndl PROPERTIES COMPILE_FLAGS "-fno-exceptions
-fno-rtti")
+    add_target_compile_flags(idndl "-fno-exceptions -fno-rtti")
 endif(NOT MSVC)
 
 add_importlibs(idndl kernel32)

Modified: trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra…
==============================================================================
--- trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1]
(original)
+++ trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1] Sun Oct 
2 18:59:33 2011
@@ -14,9 +14,9 @@
 
 if(ARCH MATCHES i386)
     if(MSVC)
-        set_target_properties(framebuf_new PROPERTIES COMPILE_FLAGS "/Gz")
+        add_target_compile_flags(framebuf_new "/Gz")
     else()
-        set_target_properties(framebuf_new PROPERTIES COMPILE_FLAGS "-mrtd
-fno-builtin")
+        add_target_compile_flags(framebuf_new "-mrtd -fno-builtin")
     endif()
 endif()
 

Modified: trunk/reactos/drivers/video/displays/framebuf_new/framebuf_new.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra…
==============================================================================
--- trunk/reactos/drivers/video/displays/framebuf_new/framebuf_new.rbuild [iso-8859-1]
(original)
+++ trunk/reactos/drivers/video/displays/framebuf_new/framebuf_new.rbuild [iso-8859-1] Sun
Oct  2 18:59:33 2011
@@ -12,8 +12,8 @@
 	<file>framebuf_new.rc</file>
 	<if property="ARCH" value="i386">
 		<group compilerset="gcc">
-	        	<compilerflag>-mrtd</compilerflag>
-        		<compilerflag>-fno-builtin</compilerflag>
+			<compilerflag>-mrtd</compilerflag>
+			<compilerflag>-fno-builtin</compilerflag>
 			<compilerflag>-Wno-unused-variable</compilerflag>
 		</group>
 	</if>

Modified: trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga…
==============================================================================
--- trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] Sun Oct  2
18:59:33 2011
@@ -12,9 +12,9 @@
 target_link_libraries(vga libcntpr)
 
 if(MSVC)
-set_target_properties(vga PROPERTIES COMPILE_FLAGS "/Gz")
+    add_target_compile_flags(vga "/Gz")
 else()
-set_target_properties(vga PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin")
+    add_target_compile_flags(vga "-mrtd -fno-builtin")
 endif()
 
 set_module_type(vga kernelmodedriver)

Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1]
(original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] Sun Oct  2
18:59:33 2011
@@ -57,10 +57,10 @@
     ${PSEH_LIB})
 
 if(MSVC)
-    set_target_properties(portcls PROPERTIES COMPILE_FLAGS "/GR-")
+    add_target_compile_flags(portcls "/GR-")
 else()
     target_link_libraries(portcls -lgcc)
-    set_target_properties(portcls PROPERTIES COMPILE_FLAGS "-fno-exceptions
-fno-rtti")
+    add_target_compile_flags(portcls "-fno-exceptions -fno-rtti")
 endif(MSVC)
 
 add_pch(portcls private.hpp)

Modified: trunk/reactos/hal/halx86/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?…
==============================================================================
--- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Sun Oct  2 18:59:33 2011
@@ -138,7 +138,7 @@
     set_entrypoint(halacpi HalInitSystem@8)
     set_subsystem(halacpi native)
     set_image_base(halacpi 0x00010000)
-    set_property(TARGET halacpi PROPERTY COMPILE_DEFINITIONS CONFIG_ACPI)
+    add_target_compile_definitions(halacpi CONFIG_ACPI)
     add_cd_file(TARGET halacpi DESTINATION reactos/system32 NO_CAB FOR all)
     if(MSVC)
         add_target_link_flags(halacpi "/ignore:4216 /ignore:4078")
@@ -146,7 +146,7 @@
 
     # mini_hal
     add_library(mini_hal ${MINI_HAL_SOURCE})
-    set_property(TARGET mini_hal PROPERTY COMPILE_DEFINITIONS
"_BLDR_;_MINIHAL_")
+    add_target_compile_definitions(mini_hal _BLDR_ _MINIHAL_)
     add_dependencies(mini_hal psdk bugcodes asm)
 
 elseif(ARCH MATCHES amd64)

Modified: trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CMakeLi…
==============================================================================
--- trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Sun Oct  2 18:59:33 2011
@@ -47,19 +47,19 @@
     target_link_libraries(mingw_common oldnames)
 endif()
 
-set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE)
+add_target_compile_definitions(mingw_common _M_CEE_PURE)
 add_dependencies(mingw_common psdk)
 
 add_library(mingw_main crt0_c.c crtexe.c dllargv.c)
-set_property(TARGET mingw_main PROPERTY COMPILE_DEFINITIONS _DLL __USE_CRTIMP)
+add_target_compile_definitions(mingw_main _DLL __USE_CRTIMP)
 add_dependencies(mingw_main psdk)
 
 add_library(mingw_wmain crt0_w.c crtexe.c dllargv.c)
-set_property(TARGET mingw_wmain PROPERTY COMPILE_DEFINITIONS WPRFLAG UNICODE _UNICODE)
+add_target_compile_definitions(mingw_wmain WPRFLAG UNICODE _UNICODE)
 add_dependencies(mingw_wmain psdk)
 
 add_library(mingw_dllmain crtdll.c dllargv.c)
-set_property(TARGET mingw_dllmain PROPERTY COMPILE_DEFINITIONS CRTDLL _WINDOWS_)
+add_target_compile_definitions(mingw_dllmain CRTDLL _WINDOWS_)
 add_dependencies(mingw_dllmain psdk)
 
 if(NOT MSVC)
@@ -73,5 +73,5 @@
 endif()
 
 add_library(getopt getopt.c)
-set_property(TARGET getopt PROPERTY COMPILE_DEFINITIONS _DLL __USE_CRTIMP)
+add_target_compile_definitions(getopt _DLL __USE_CRTIMP)
 add_dependencies(getopt psdk)

Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/CMakeLists.txt…
==============================================================================
--- trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Sun Oct  2 18:59:33 2011
@@ -37,8 +37,8 @@
     string/mbstowcs_nt.c
     string/wcstombs_nt.c)
 
-set_property(TARGET user32_wsprintf PROPERTY COMPILE_DEFINITIONS _USER32_WSPRINTF)
+add_target_compile_definitions(user32_wsprintf _USER32_WSPRINTF)
 
 add_library(getopt misc/getopt.c)
-set_property(TARGET getopt PROPERTY COMPILE_DEFINITIONS _DLL __USE_CRTIMP)
+add_target_compile_definitions(getopt _DLL __USE_CRTIMP)
 add_dependencies(getopt psdk)

Modified: trunk/reactos/lib/sdk/crt/crt.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=…
==============================================================================
--- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Sun Oct  2 18:59:33 2011
@@ -442,6 +442,6 @@
 
 add_library(crt ${CRT_SOURCE})
 target_link_libraries(crt chkstk)
-set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern
USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT)
+add_target_compile_definitions(crt __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_
_MSVCRT_ _MT)
 #add_pch(crt precomp.h)
 add_dependencies(crt psdk asm)

Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake…
==============================================================================
--- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Sun Oct  2 18:59:33 2011
@@ -175,5 +175,5 @@
 endif()
 
 add_library(libcntpr ${LIBCNTPR_SOURCE})
-set_property(TARGET libcntpr PROPERTY COMPILE_DEFINITIONS NO_RTL_INLINES _NTSYSTEM_
_NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE)
+add_target_compile_definitions(libcntpr NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_
__CRT__NO_INLINE)
 add_dependencies(libcntpr psdk asm)

Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake…
==============================================================================
--- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sun Oct  2 18:59:33 2011
@@ -36,24 +36,23 @@
 )
 
 if(NOT MSVC)
-list(APPEND MSVCRTEX_SOURCE
-    startup/pseudo-reloc.c
-    startup/pseudo-reloc-list.c)
+    list(APPEND MSVCRTEX_SOURCE
+        startup/pseudo-reloc.c
+        startup/pseudo-reloc-list.c)
 endif()
 
 if(ARCH MATCHES i386)
-list(APPEND MSVCRTEX_SOURCE
-    except/i386/chkstk_asm.s
-    except/i386/chkstk_ms.s
-    math/i386/ci.c
-    math/i386/ftol2_asm.s
-    math/i386/alldiv_asm.s
-)
+    list(APPEND MSVCRTEX_SOURCE
+        except/i386/chkstk_asm.s
+        except/i386/chkstk_ms.s
+        math/i386/ci.c
+        math/i386/ftol2_asm.s
+        math/i386/alldiv_asm.s)
 elseif(ARCH MATCHES amd64)
-list(APPEND MSVCRTEX_SOURCE
-    except/amd64/chkstk_asm.s
-    except/amd64/chkstk_ms.s
-    math/amd64/alldiv.S)
+    list(APPEND MSVCRTEX_SOURCE
+        except/amd64/chkstk_asm.s
+        except/amd64/chkstk_ms.s
+        math/amd64/alldiv.S)
 endif()
 
 if(MSVC)
@@ -63,7 +62,7 @@
 endif()
 
 add_library(msvcrtex ${MSVCRTEX_SOURCE})
-set_target_properties(msvcrtex PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE)
+add_target_compile_definitions(msvcrtex _M_CEE_PURE)
 set_source_files_properties(startup/crtdll.c PROPERTIES COMPILE_DEFINITIONS CRTDLL)
 
 if(NOT MSVC)