Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 23:32:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- Use the new macros for link flags and compile definitions some more. No semantic changes

svn path=/trunk/; revision=53931
This commit is contained in:
Thomas Faber 2011-10-02 18:59:33 +00:00
parent 80406e33cf
commit 63a058da88
17 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/boot/freeldr/freeldr/CMakeLists.txt
View file

@ -166,10 +166,10 @@ add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE})
add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE})
if(NOT MSVC) 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") 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() 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") 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() endif()
@ -229,12 +229,13 @@ add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
if(NOT MSVC) 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") 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() 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") 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() endif()
add_target_compile_definitions(setupldr_pe FREELDR_REACTOS_SETUP)
set_image_base(setupldr_pe 0x10000) set_image_base(setupldr_pe 0x10000)
set_subsystem(setupldr_pe native) set_subsystem(setupldr_pe native)

4
reactos/dll/directx/ksproxy/CMakeLists.txt
View file

@ -31,10 +31,10 @@ add_library(ksproxy SHARED
set_entrypoint(ksproxy 0) set_entrypoint(ksproxy 0)
set_target_properties(ksproxy PROPERTIES SUFFIX ".ax") set_target_properties(ksproxy PROPERTIES SUFFIX ".ax")
if(MSVC) if(MSVC)
set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "/GR-") add_target_compile_flags(ksproxy "/GR-")
else() else()
#FIXME : can't build if this is enabled, check if this is needed #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) target_link_libraries(ksproxy -lsupc++ -lgcc -lmingw32 oldnames)
endif() endif()

2
reactos/dll/nls/idndl/CMakeLists.txt
View file

@ -11,7 +11,7 @@ add_library(idndl SHARED
set_entrypoint(idndl 0) set_entrypoint(idndl 0)
if(NOT MSVC) 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) endif(NOT MSVC)
add_importlibs(idndl kernel32) add_importlibs(idndl kernel32)

4
reactos/drivers/video/displays/framebuf_new/CMakeLists.txt
View file

@ -14,9 +14,9 @@ add_library(framebuf_new SHARED ${SOURCE})
if(ARCH MATCHES i386) if(ARCH MATCHES i386)
if(MSVC) if(MSVC)
set_target_properties(framebuf_new PROPERTIES COMPILE_FLAGS "/Gz") add_target_compile_flags(framebuf_new "/Gz")
else() else()
set_target_properties(framebuf_new PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") add_target_compile_flags(framebuf_new "-mrtd -fno-builtin")
endif() endif()
endif() endif()

4
reactos/drivers/video/miniport/vga_new/CMakeLists.txt
View file

@ -12,9 +12,9 @@ add_library(vga SHARED ${SOURCE})
target_link_libraries(vga libcntpr) target_link_libraries(vga libcntpr)
if(MSVC) if(MSVC)
set_target_properties(vga PROPERTIES COMPILE_FLAGS "/Gz") add_target_compile_flags(vga "/Gz")
else() else()
set_target_properties(vga PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") add_target_compile_flags(vga "-mrtd -fno-builtin")
endif() endif()
set_module_type(vga kernelmodedriver) set_module_type(vga kernelmodedriver)

4
reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt
View file

@ -57,10 +57,10 @@ target_link_libraries(portcls
${PSEH_LIB}) ${PSEH_LIB})
if(MSVC) if(MSVC)
set_target_properties(portcls PROPERTIES COMPILE_FLAGS "/GR-") add_target_compile_flags(portcls "/GR-")
else() else()
target_link_libraries(portcls -lgcc) 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) endif(MSVC)
add_pch(portcls private.hpp) add_pch(portcls private.hpp)

4
reactos/hal/halx86/CMakeLists.txt
View file

@ -138,7 +138,7 @@ if(ARCH MATCHES i386)
set_entrypoint(halacpi HalInitSystem@8) set_entrypoint(halacpi HalInitSystem@8)
set_subsystem(halacpi native) set_subsystem(halacpi native)
set_image_base(halacpi 0x00010000) 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) add_cd_file(TARGET halacpi DESTINATION reactos/system32 NO_CAB FOR all)
if(MSVC) if(MSVC)
add_target_link_flags(halacpi "/ignore:4216 /ignore:4078") add_target_link_flags(halacpi "/ignore:4216 /ignore:4078")
@ -146,7 +146,7 @@ if(ARCH MATCHES i386)
# mini_hal # mini_hal
add_library(mini_hal ${MINI_HAL_SOURCE}) 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) add_dependencies(mini_hal psdk bugcodes asm)
elseif(ARCH MATCHES amd64) elseif(ARCH MATCHES amd64)

10
reactos/lib/3rdparty/mingw/CMakeLists.txt vendored
View file

@ -47,19 +47,19 @@ if(NOT MSVC)
target_link_libraries(mingw_common oldnames) target_link_libraries(mingw_common oldnames)
endif() 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_dependencies(mingw_common psdk)
add_library(mingw_main crt0_c.c crtexe.c dllargv.c) 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_dependencies(mingw_main psdk)
add_library(mingw_wmain crt0_w.c crtexe.c dllargv.c) 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_dependencies(mingw_wmain psdk)
add_library(mingw_dllmain crtdll.c dllargv.c) 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) add_dependencies(mingw_dllmain psdk)
if(NOT MSVC) if(NOT MSVC)
@ -73,5 +73,5 @@ if(NOT MSVC)
endif() endif()
add_library(getopt getopt.c) 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) add_dependencies(getopt psdk)

4
reactos/lib/sdk/crt/CMakeLists.txt
View file

@ -37,8 +37,8 @@ add_library(user32_wsprintf
string/mbstowcs_nt.c string/mbstowcs_nt.c
string/wcstombs_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) 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) add_dependencies(getopt psdk)

2
reactos/lib/sdk/crt/crt.cmake
View file

@ -442,6 +442,6 @@ endif()
add_library(crt ${CRT_SOURCE}) add_library(crt ${CRT_SOURCE})
target_link_libraries(crt chkstk) 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_pch(crt precomp.h)
add_dependencies(crt psdk asm) add_dependencies(crt psdk asm)

2
reactos/lib/sdk/crt/libcntpr.cmake
View file

@ -175,5 +175,5 @@ else()
endif() endif()
add_library(libcntpr ${LIBCNTPR_SOURCE}) 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) add_dependencies(libcntpr psdk asm)

5
reactos/lib/sdk/crt/msvcrtex.cmake
View file

@ -47,8 +47,7 @@ list(APPEND MSVCRTEX_SOURCE
except/i386/chkstk_ms.s except/i386/chkstk_ms.s
math/i386/ci.c math/i386/ci.c
math/i386/ftol2_asm.s math/i386/ftol2_asm.s
math/i386/alldiv_asm.s math/i386/alldiv_asm.s)
)
elseif(ARCH MATCHES amd64) elseif(ARCH MATCHES amd64)
list(APPEND MSVCRTEX_SOURCE list(APPEND MSVCRTEX_SOURCE
except/amd64/chkstk_asm.s except/amd64/chkstk_asm.s
@ -63,7 +62,7 @@ else()
endif() endif()
add_library(msvcrtex ${MSVCRTEX_SOURCE}) 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) set_source_files_properties(startup/crtdll.c PROPERTIES COMPILE_DEFINITIONS CRTDLL)
if(NOT MSVC) if(NOT MSVC)