[FRELDR/SETUPLDR]

* Simplify these checks now that we have RosBE 2.1.

svn path=/trunk/; revision=60240

diff --git a/reactos/boot/freeldr/freeldr/CMakeLists.txt b/reactos/boot/freeldr/freeldr/CMakeLists.txt
index 5378b6f..d837fd6 100644 (file)
--- a/reactos/boot/freeldr/freeldr/CMakeLists.txt
+++ b/reactos/boot/freeldr/freeldr/CMakeLists.txt
@@ -151,7 +151,7 @@ else()
 #TBD
 endif()
 
-if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7))
+if(NOT MSVC)
     add_library(freeldr_common OBJECT ${FREELDR_COMMON_SOURCE} ${FREELDR_COMMON_ASM_SOURCE})
 else()
     add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE})
@@ -172,7 +172,7 @@ if(NOT MSVC)
     list(APPEND FREELDR_BASE_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def)
 endif()
 
-if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7))
+if(NOT MSVC)
     add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE})
     add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE})
     if(SEPARATE_DBG)
@@ -205,7 +205,7 @@ if(ARCH STREQUAL "i386")
     target_link_libraries(freeldr_pe_dbg mini_hal)
 endif()
 
-if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7))
+if(MSVC)
     target_link_libraries(freeldr_pe freeldr_common)
     target_link_libraries(freeldr_pe_dbg freeldr_common)
 endif()
@@ -236,7 +236,7 @@ if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64")
     list(APPEND SETUPLDR_SOURCE windows/setupldr.c)
 endif()
 
-if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7))
+if(NOT MSVC)
     add_library(setupldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
     add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
     if(SEPARATE_DBG)
@@ -272,7 +272,7 @@ if(ARCH STREQUAL "i386")
     target_link_libraries(setupldr_pe_dbg mini_hal)
 endif()
 
-if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7))
+if(MSVC)
     target_link_libraries(setupldr_pe freeldr_common)
     target_link_libraries(setupldr_pe_dbg freeldr_common)
 endif()