Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-03 18:10:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE]

Browse source 
Add stubs file to source automatically.

Gcc: fix set_rc_compiler() so that it doesn't conflict with custom_incdefs().

svn path=/branches/cmake-bringup/; revision=49893
This commit is contained in:
Sylvain Petreolle 2010-12-02 12:36:16 +00:00
parent cabd360822
commit 1d2630cc29
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/storage/classpnp/CMakeLists.txt
View file

@ -13,6 +13,9 @@ if(NOT MSVC)
add_definitions(-mrtd -fno-builtin -w)
endif()
spec2def(classpnp.sys class.spec)
list(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_BINARY_DIR}/class_stubs.c)
list(APPEND SOURCE
autorun.c
class.c
@ -31,8 +34,6 @@ list(APPEND SOURCE
class.rc
${CMAKE_CURRENT_BINARY_DIR}/class.def)
spec2def(classpnp.sys class.spec)
add_library(classpnp SHARED ${SOURCE})
target_link_libraries(classpnp ${PSEH_LIB} libcntpr)

7
gcc.cmake
View file

@ -173,14 +173,14 @@ macro(set_rc_compiler)
get_directory_property(includes INCLUDE_DIRECTORIES)
foreach(arg ${defines})
set(result_defs "${result_defs} -D${arg}")
set(rc_result_defs "${rc_result_defs} -D${arg}")
endforeach(arg ${defines})
foreach(arg ${includes})
set(result_incs "-I${arg} ${result_incs}")
set(rc_result_incs "-I${arg} ${rc_result_incs}")
endforeach(arg ${includes})
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${result_defs} ${result_incs} -i <SOURCE> -O coff -o <OBJECT>")
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} ${rc_result_incs} -i <SOURCE> -O coff -o <OBJECT>")
endmacro()
#idl files support
@ -206,6 +206,7 @@ macro(spec2def _dllname _spec_file)
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE)
list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c)
endmacro()
# Optional 3rd parameter: dllname

1
msc.cmake
View file

@ -200,6 +200,7 @@ macro(spec2def _dllname _spec_file)
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c
PROPERTIES GENERATED TRUE)
list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c)
endmacro()
# Optional 3rd parameter: dllname