Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 14:25:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- Fix precompiled header support (the pch cleanup phase).
- Improve its use in crt.

svn path=/branches/cmake-bringup/; revision=48452
This commit is contained in:
Amine Khaldi 2010-08-04 10:38:17 +00:00
parent ce238e95a4
commit ba7d98adba
2 changed files with 28 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

56
CMakeMacros.cmake
View file

@ -1,40 +1,40 @@
MACRO(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename) MACRO(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename)
# Add the precompiled header to the build # Add the precompiled header to the build
SET(_gch_filename "${_header_filename}.gch") set(_gch_filename "${_header_filename}.gch")
LIST(APPEND ${_out_compile_flags} -c ${_header_filename} -o ${_gch_filename}) list(APPEND ${_out_compile_flags} -c ${_header_filename} -o ${_gch_filename})
# This gets us our includes # This gets us our includes
GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES) get_directory_property(DIRINC INCLUDE_DIRECTORIES)
FOREACH(item ${DIRINC}) foreach(item ${DIRINC})
LIST(APPEND ${_out_compile_flags} -I${item}) list(APPEND ${_out_compile_flags} -I${item})
ENDFOREACH(item) endforeach(item)
# This is a particular bit of undocumented/hacky magic I'm quite proud of # This is a particular bit of undocumented/hacky magic I'm quite proud of
GET_DIRECTORY_PROPERTY(_compiler_flags DEFINITIONS) get_directory_property(_compiler_flags DEFINITIONS)
STRING(REPLACE "\ " "\t" _compiler_flags ${_compiler_flags}) STRING(REPLACE "\ " "\t" _compiler_flags ${_compiler_flags})
LIST(APPEND ${_out_compile_flags} ${_compiler_flags}) list(APPEND ${_out_compile_flags} ${_compiler_flags})
# This gets any specific definitions that were added with set-target-property # This gets any specific definitions that were added with set-target-property
GET_TARGET_PROPERTY(_target_defs ${_target_name} COMPILE_DEFINITIONS) GET_TARGET_PROPERTY(_target_defs ${_target_name} COMPILE_DEFINITIONS)
IF (_target_defs) if (_target_defs)
FOREACH(item ${_target_defs}) foreach(item ${_target_defs})
LIST(APPEND ${_out_compile_flags} -D${item}) list(APPEND ${_out_compile_flags} -D${item})
ENDFOREACH(item) endforeach(item)
ENDIF() endif()
ENDMACRO(_PCH_GET_COMPILE_FLAGS) ENDMACRO(_PCH_GET_COMPILE_FLAGS)
MACRO(add_pch _target_name _header_filename _src_list) MACRO(add_pch _target_name _header_filename _src_list)
SET(_gch_filename "${_header_filename}.gch") set(_gch_filename "${_header_filename}.gch")
list(APPEND ${_src_list} ${_gch_filename})
_PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename})
file(REMOVE ${_gch_filename})
add_custom_command(
OUTPUT ${_gch_filename}
COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args}
DEPENDS ${_header_filename})
LIST(APPEND ${_src_list} ${_gch_filename})
_PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename})
add_custom_command(OUTPUT ${_gch_filename}
COMMAND rm -f ${_gch_filename}
COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args}
DEPENDS ${_header_filename})
ENDMACRO(add_pch _target_name _header_filename _src_list) ENDMACRO(add_pch _target_name _header_filename _src_list)

2
lib/sdk/crt/CMakeLists.txt
View file

@ -6,8 +6,6 @@ file(GLOB_RECURSE CRT_SOURCE "*.c")
LIST(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/stdio/findgen.c) LIST(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/stdio/findgen.c)
LIST(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strtold.c) LIST(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strtold.c)
SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/precomp.h.gch PROPERTIES GENERATED ON)
add_library(crt ${CRT_SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h.gch) add_library(crt ${CRT_SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h.gch)
set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT)
add_pch(crt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${CRT_SOURCE}) add_pch(crt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${CRT_SOURCE})