Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-23 20:24:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
* Deduplicate add_importlibs.

svn path=/trunk/; revision=52211
This commit is contained in:
Amine Khaldi 2011-06-13 12:05:22 +00:00
parent 4c941247b4
commit c1c1acb463
3 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
reactos/cmake/CMakeMacros.cmake
View file

@ -226,3 +226,15 @@ else()
DEPENDS ${_file2}) DEPENDS ${_file2})
endmacro() endmacro()
endif() endif()
macro(add_importlibs MODULE)
add_dependency_node(${MODULE})
foreach(LIB ${ARGN})
if ("${LIB}" MATCHES "msvcrt")
target_link_libraries(${MODULE} msvcrtex)
endif()
target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}${CMAKE_STATIC_LIBRARY_SUFFIX})
add_dependencies(${MODULE} lib${LIB})
add_dependency_edge(${MODULE} ${LIB})
endforeach()
endmacro()

13
reactos/cmake/gcc.cmake
View file

@ -207,19 +207,6 @@ set(IDL_PROXY_ARG -p -P)
set(IDL_INTERFACE_ARG -u -o) set(IDL_INTERFACE_ARG -u -o)
set(IDL_DLLDATA_ARG --dlldata-only -o) set(IDL_DLLDATA_ARG --dlldata-only -o)
macro(add_importlibs MODULE)
add_dependency_node(${MODULE})
foreach(LIB ${ARGN})
if ("${LIB}" MATCHES "msvcrt")
target_link_libraries(${MODULE} msvcrtex)
endif()
target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}.a)
add_dependencies(${MODULE} lib${LIB})
add_dependency_edge(${MODULE} ${LIB})
endforeach()
endmacro()
macro(add_delay_importlibs MODULE) macro(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)

10
reactos/cmake/msvc.cmake
View file

@ -158,16 +158,6 @@ macro(add_importlib_target _exports_file)
add_dependencies(lib${_name} asm ${_dependencies}) add_dependencies(lib${_name} asm ${_dependencies})
endmacro() endmacro()
macro(add_importlibs MODULE)
foreach(LIB ${ARGN})
if ("${LIB}" MATCHES "msvcrt")
target_link_libraries(${MODULE} msvcrtex)
endif()
target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}.lib)
add_dependencies(${MODULE} lib${LIB})
endforeach()
endmacro()
macro(add_delay_importlibs MODULE) macro(add_delay_importlibs MODULE)
# TODO # TODO
endmacro() endmacro()