Author: akhaldi Date: Fri Sep 20 10:26:05 2013 New Revision: 60241
URL: http://svn.reactos.org/svn/reactos?rev=60241&view=rev Log: [HAL] * Simplify these checks now that we have RosBE 2.1.
Modified: trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/hal/halx86/acpi.cmake trunk/reactos/hal/halx86/legacy.cmake
Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?r... ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Fri Sep 20 10:26:05 2013 @@ -14,7 +14,7 @@ spec2def(${_halname}.dll ../hal.spec ADD_IMPORTLIB)
# Create the actual target - if(NOT MSVC AND (CMAKE_VERSION VERSION_GREATER 2.8.7)) + if(NOT MSVC) foreach(_component ${_haldata_COMPONENTS}) list(APPEND _haldata_SOURCES "$<TARGET_OBJECTS:lib_hal_${_component}>") endforeach()
Modified: trunk/reactos/hal/halx86/acpi.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi.cmake?rev=6... ============================================================================== --- trunk/reactos/hal/halx86/acpi.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi.cmake [iso-8859-1] Fri Sep 20 10:26:05 2013 @@ -9,6 +9,6 @@ add_dependencies(lib_hal_acpi bugcodes) #add_pch(lib_hal_acpi include/hal.h)
-if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7)) +if(MSVC) target_link_libraries(lib_hal_acpi lib_hal_generic) endif()
Modified: trunk/reactos/hal/halx86/legacy.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy.cmake?rev... ============================================================================== --- trunk/reactos/hal/halx86/legacy.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy.cmake [iso-8859-1] Fri Sep 20 10:26:05 2013 @@ -15,6 +15,6 @@ add_dependencies(lib_hal_legacy bugcodes) #add_pch(lib_hal_legacy include/hal.h)
-if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7)) +if(MSVC) target_link_libraries(lib_hal_legacy lib_hal_generic) endif()