From f91d4d599c1869bac6f01777991bf44b810a3e1e Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Wed, 1 Aug 2012 11:43:47 +0000 Subject: [PATCH] [FREELDR] Don't use fancy CMake features for MSVC builds that would require custom CMake installations. Period. ;-) svn path=/trunk/; revision=57015 --- reactos/boot/freeldr/freeldr/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/reactos/boot/freeldr/freeldr/CMakeLists.txt b/reactos/boot/freeldr/freeldr/CMakeLists.txt index b783c45484b..3ef250124e0 100644 --- a/reactos/boot/freeldr/freeldr/CMakeLists.txt +++ b/reactos/boot/freeldr/freeldr/CMakeLists.txt @@ -150,7 +150,7 @@ else() #TBD endif() -if(CMAKE_VERSION VERSION_GREATER 2.8.7) +if(NOT MSVC AND CMAKE_VERSION VERSION_GREATER 2.8.7) add_library(freeldr_common OBJECT ${FREELDR_COMMON_SOURCE}) else() add_library(freeldr_common ${FREELDR_COMMON_SOURCE}) @@ -171,7 +171,7 @@ if(NOT MSVC) endif() -if(CMAKE_VERSION VERSION_GREATER 2.8.7) +if(NOT MSVC AND CMAKE_VERSION VERSION_GREATER 2.8.7) add_library(freeldr_pe SHARED $ ${FREELDR_BASE_SOURCE}) add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $ ${FREELDR_BASE_SOURCE}) else() @@ -200,7 +200,7 @@ if(ARCH MATCHES i386) target_link_libraries(freeldr_pe_dbg mini_hal) endif() -if(NOT CMAKE_VERSION VERSION_GREATER 2.8.7) +if(MSVC OR NOT CMAKE_VERSION VERSION_GREATER 2.8.7) target_link_libraries(freeldr_pe freeldr_common) target_link_libraries(freeldr_pe_dbg freeldr_common) endif() @@ -231,7 +231,7 @@ if(ARCH MATCHES i386 OR ARCH MATCHES amd64) list(APPEND SETUPLDR_SOURCE windows/setupldr.c) endif() -if(CMAKE_VERSION VERSION_GREATER 2.8.7) +if(NOT MSVC AND CMAKE_VERSION VERSION_GREATER 2.8.7) add_library(setupldr_pe SHARED $ ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $ ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) else() @@ -263,7 +263,7 @@ if(ARCH MATCHES i386) target_link_libraries(setupldr_pe_dbg mini_hal) endif() -if(NOT CMAKE_VERSION VERSION_GREATER 2.8.7) +if(MSVC OR NOT CMAKE_VERSION VERSION_GREATER 2.8.7) target_link_libraries(setupldr_pe freeldr_common) target_link_libraries(setupldr_pe_dbg freeldr_common) endif()