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

[CMAKE]

Browse source 
- cmake handles gracefully def files if you tell him to do ;-)
  - partial revert of an (accidental?) kernel32 change

svn path=/branches/cmake-bringup/; revision=49380
This commit is contained in:
Jérôme Gardou 2010-10-31 22:15:35 +00:00
parent 1ddb50ec34
commit a6524961b3
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeMacros.cmake
View file

@ -46,7 +46,9 @@ MACRO(spec2def _dllname _spec_file)
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} --filename ${_dllname} COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} --filename ${_dllname}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file})
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)
ENDMACRO(spec2def _dllname _spec_file) ENDMACRO(spec2def _dllname _spec_file)
if (NOT MSVC) if (NOT MSVC)

4
dll/win32/kernel32/CMakeLists.txt
View file

@ -100,8 +100,8 @@ list(APPEND SOURCE
if(ARCH MATCHES i386) if(ARCH MATCHES i386)
list(APPEND SOURCE list(APPEND SOURCE
# thread/i386/fiber.S thread/i386/fiber.S
# thread/i386/thread.S thread/i386/thread.S
) )
elseif(ARCH MATCHES amd64) elseif(ARCH MATCHES amd64)
list(APPEND SOURCE list(APPEND SOURCE