Author: tkreuzer
Date: Wed Aug 1 11:43:47 2012
New Revision: 57015
URL:
http://svn.reactos.org/svn/reactos?rev=57015&view=rev
Log:
[FREELDR]
Don't use fancy CMake features for MSVC builds that would require custom CMake
installations. Period. ;-)
Modified:
trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt
Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Wed Aug 1 11:43:47
2012
@@ -150,7 +150,7 @@
#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 @@
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 $<TARGET_OBJECTS:freeldr_common>
${FREELDR_BASE_SOURCE})
add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL
$<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE})
else()
@@ -200,7 +200,7 @@
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 @@
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 $<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})
else()
@@ -263,7 +263,7 @@
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()