Merge branch 'master' of ssh://vamos.informatik.uni-erlangen.de:29418/fail

Change-Id: I35e86d4b367be395121451a86f2731606f43eeff
This commit is contained in:
Martin Hoffmann
2013-03-22 16:21:30 +01:00
17 changed files with 773 additions and 15 deletions

View File

@ -66,8 +66,10 @@ include_directories(${CMAKE_BINARY_DIR}/src/core)
# FIXME: this should be in src/core/CMakeLists.txt but actually doesn't work
## Add CMakeLists from subdirectories:
add_subdirectory(tools)
add_subdirectory(src)
#### Backend-related build system stuff
include(bochs)
include(gem5)