build system cosmetics: backends reordered

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1608 8c4709b5-6ec9-48aa-a5cd-a96041d1645a

CMakeLists.txt

@@ -26,10 +26,10 @@ SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 #### Compiler configuration, see cmake/compilerconfig.cmake
 include(compilerconfig)
 
-#### #OPTION to configure Bochs/OVP ####
-OPTION( BUILD_OVP    "Build OVP Variant?" OFF) # Defaults to BOCHS  ON
-OPTION( BUILD_GEM5   "Build gem5 Variant?" OFF)
+#### Backend selection ####
 OPTION( BUILD_BOCHS  "Build Bochs Variant?" ON)
+OPTION( BUILD_GEM5   "Build gem5 Variant?" OFF)
+OPTION( BUILD_OVP    "Build OVP Variant?" OFF)
 
 if(BUILD_BOCHS)
   ## add necessary additional header search paths.

src/core/sal/CMakeLists.txt

@@ -9,7 +9,7 @@ if(BUILD_BOCHS)
 		bochs/BochsController.cc
 		bochs/BochsListener.cc
 	)
-elseif(BUILD_OVP)
+elseif(BUILD_GEM5)
 	set(SRCS
 		BufferCache.cc
 		Listener.cc
@@ -17,9 +17,11 @@ elseif(BUILD_OVP)
 		SALConfig.cc
 		Register.cc
 		SimulatorController.cc
-		${VARIANT}/OVPController.cc
+		gem5/Gem5Controller.cc
+		gem5/Gem5Listener.cc
+		gem5/Gem5PCEvent.cc
 	)
-elseif(BUILD_GEM5)
+elseif(BUILD_OVP)
 	set(SRCS
 		BufferCache.cc
 		Listener.cc
@@ -27,9 +29,7 @@ elseif(BUILD_GEM5)
 		SALConfig.cc
 		Register.cc
 		SimulatorController.cc
-		gem5/Gem5Controller.cc
-		gem5/Gem5Listener.cc
-		gem5/Gem5PCEvent.cc
+		${VARIANT}/OVPController.cc
 	)
 endif(BUILD_BOCHS)