Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:33:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- Remove /nologo option from RC again - WDK's version doesn't support it
- Add /nologo to MIDL's flags
- Remove redundant IDL compiler declaration for GCC build

svn path=/trunk/; revision=53447
This commit is contained in:
Thomas Faber 2011-08-25 22:32:57 +00:00
parent 2d9edcdec1
commit 4b00accabe
3 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/cmake/gcc.cmake
View file

@ -191,15 +191,6 @@ function(set_rc_compiler)
"<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>" PARENT_SCOPE) "<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>" PARENT_SCOPE)
endfunction() endfunction()
#idl files support
set(IDL_COMPILER native-widl)
if(ARCH MATCHES i386)
set(IDL_FLAGS -m32 --win32)
elseif(ARCH MATCHES amd64)
set(IDL_FLAGS -m64 --win64)
endif()
function(add_delay_importlibs MODULE) function(add_delay_importlibs MODULE)
foreach(LIB ${ARGN}) foreach(LIB ${ARGN})
target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}_delayed.a) target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}_delayed.a)

6
reactos/cmake/idl-support.cmake
View file

@ -10,11 +10,11 @@ if(MSVC)
set(IDL_PROXY_ARG /proxy) set(IDL_PROXY_ARG /proxy)
set(IDL_INTERFACE_ARG /iid) set(IDL_INTERFACE_ARG /iid)
if(ARCH MATCHES i386) if(ARCH MATCHES i386)
set(IDL_FLAGS /win32) set(IDL_FLAGS /nologo /win32)
elseif(ARCH MATCHES amd64) elseif(ARCH MATCHES amd64)
set(IDL_FLAGS /amd64) set(IDL_FLAGS /nologo /amd64)
else() else()
set(IDL_FLAGS "") set(IDL_FLAGS /nologo)
endif() endif()
set(IDL_DEPENDS "") set(IDL_DEPENDS "")
else() else()

4
reactos/cmake/msvc.cmake
View file

@ -36,7 +36,7 @@ endif()
link_directories(${REACTOS_SOURCE_DIR}/importlibs ${REACTOS_BINARY_DIR}/importlibs ${REACTOS_BINARY_DIR}/lib/sdk/crt) link_directories(${REACTOS_SOURCE_DIR}/importlibs ${REACTOS_BINARY_DIR}/importlibs ${REACTOS_BINARY_DIR}/lib/sdk/crt)
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>")
if(MSVC_IDE) if(MSVC_IDE)
# Asm source files are not supported in VS generators yet. As a result, <DEFINES> isn't recognized. # Asm source files are not supported in VS generators yet. As a result, <DEFINES> isn't recognized.
@ -143,7 +143,7 @@ function(set_rc_compiler)
set(rc_result_incs "/I${arg} ${rc_result_incs}") set(rc_result_incs "/I${arg} ${rc_result_incs}")
endforeach() endforeach()
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo ${rc_result_defs} /I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} /fo <OBJECT> <SOURCE>" PARENT_SCOPE) set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} /I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} /fo <OBJECT> <SOURCE>" PARENT_SCOPE)
endfunction() endfunction()
# Thanks MS for creating a stupid linker # Thanks MS for creating a stupid linker