From a77a2aa55f719d564bf66dc9e16683daf51a64ec Mon Sep 17 00:00:00 2001 From: hsc Date: Tue, 11 Sep 2012 17:09:56 +0000 Subject: [PATCH] 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 | 6 +++--- src/core/sal/CMakeLists.txt | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e145d1eb..684d1172 100644 --- a/CMakeLists.txt +++ b/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. diff --git a/src/core/sal/CMakeLists.txt b/src/core/sal/CMakeLists.txt index 01428081..94020fcf 100644 --- a/src/core/sal/CMakeLists.txt +++ b/src/core/sal/CMakeLists.txt @@ -9,16 +9,6 @@ if(BUILD_BOCHS) bochs/BochsController.cc bochs/BochsListener.cc ) -elseif(BUILD_OVP) - set(SRCS - BufferCache.cc - Listener.cc - ListenerManager.cc - SALConfig.cc - Register.cc - SimulatorController.cc - ${VARIANT}/OVPController.cc - ) elseif(BUILD_GEM5) set(SRCS BufferCache.cc @@ -31,6 +21,16 @@ elseif(BUILD_GEM5) gem5/Gem5Listener.cc gem5/Gem5PCEvent.cc ) +elseif(BUILD_OVP) + set(SRCS + BufferCache.cc + Listener.cc + ListenerManager.cc + SALConfig.cc + Register.cc + SimulatorController.cc + ${VARIANT}/OVPController.cc + ) endif(BUILD_BOCHS) add_library(sal ${SRCS})