[akhaldi] 57280: [FREELDR/SETUPLDR] * Make freeldr_common depend on bugcodes and remove this dependency from the other targets. * Improve those conditions readability a bit.

Author: akhaldi
Date: Tue Sep 11 18:10:29 2012
New Revision: 57280

URL: http://svn.reactos.org/svn/reactos?rev=57280&view=rev
Log:
[FREELDR/SETUPLDR]
* Make freeldr_common depend on bugcodes and remove this dependency from the other targets.
* Improve those conditions readability a bit.

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/CMakeL...
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Tue Sep 11 18:10:29 2012
@@ -148,12 +148,12 @@
 #TBD
 endif()

-if(NOT MSVC AND 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})
-    add_dependencies(freeldr_common bugcodes)
-endif()
+endif()
+add_dependencies(freeldr_common bugcodes)

if(ARCH STREQUAL "i386" AND NOT MSVC)
     list(APPEND FREELDR_BASE_SOURCE arch/i386/multiboot.S)
@@ -168,12 +168,9 @@
     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) AND (CMAKE_VERSION VERSION_GREATER 2.8.7))
     add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE})
-    add_dependencies(freeldr_pe bugcodes)
     add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE})
-    add_dependencies(freeldr_pe_dbg bugcodes)
 else()
     add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE})
     add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE})
@@ -231,11 +228,9 @@
     list(APPEND SETUPLDR_SOURCE windows/setupldr.c)
 endif()

-if(NOT MSVC AND 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_dependencies(setupldr_pe bugcodes)
     add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
-    add_dependencies(setupldr_pe_dbg bugcodes)
 else()
     add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
     add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
@@ -265,7 +260,7 @@
     target_link_libraries(setupldr_pe_dbg mini_hal)
 endif()

-if(MSVC OR 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()