christoph/fail
1
Fork 0
Code Releases Activity

variant_config.h.in moves to config/

Browse Source 
... and is instantiated in the build tree now.

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@957 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-03-08 22:54:02 +00:00
parent b70b6fb43a
commit e5fea2dbcd
7 changed files with 8 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/CMakeLists.txt
View File

@ -30,8 +30,7 @@ endif(DOXYGEN_FOUND)
## Add CMakeLists from subdirectories ##
# The autogenerated header files
# FIXME disabled for now; we'll need it later on for other configuration stuff.
#add_subdirectory(config)
add_subdirectory(config)
# fail* targets
add_subdirectory(jobserver)

2
core/SAL/SALConfig.hpp
View File

@ -4,7 +4,7 @@
#include <stdint.h>
#include "../variant_config.h"
#include "config/variant_config.h"
#if defined BUILD_BOCHS

2
core/SAL/SALInst.hpp
View File

@ -2,7 +2,7 @@
#define __SAL_INSTANCE_HPP__
#include "SALConfig.hpp"
#include "../variant_config.h"
#include "config/variant_config.h"
#ifdef BUILD_BOCHS

16
core/config/CMakeLists.txt
View File

@ -1,13 +1,3 @@
option( EXP_MHTEST "MH Testcampaign" on)
option( EXP_FAULTCOV "Fault coverage experiment" OFF)
option( EXP_HSCSIMPLE "HSC simple experiment" OFF)
option( EXP_COOLCHECKSUM "Test campaign for chb's cool checksum" OFF)
option( EXP_CHECKSUM_OOSTUBS "OOStuBS Checksum" OFF)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/experiments.hpp.in
${CMAKE_CURRENT_BINARY_DIR}/experiments.hpp @ONLY}
)
#### Configuration file emitting BUILD_OVP/BOCHS defines ####
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/variant_config.h.in
${CMAKE_CURRENT_BINARY_DIR}/variant_config.h)

24
core/config/experiments.hpp.in
View File

@ -1,24 +0,0 @@
/**
* Copyright DanceOS Project
* http://www.danceos.org
*
* \file experiments.h.in
* \brief Experiment configuration
* \author Martin Hoffmann <hoffmann@cs.fau.de>
*
* The defines are generated by cmake.
* \attention THIS FILE IS AUTOGENERATED, DO NOT EDIT!
*/
#ifndef EXPERIMENTS_H
#define EXPERIMENTS_H
#cmakedefine EXP_MHTEST
#cmakedefine EXP_FAULTCOV
#cmakedefine EXP_HSCSIMPLE
#cmakedefine EXP_COOLCHECKSUM
#cmakedefine EXP_CHECKSUM_OOSTUBS
#endif // EXPERIMENTS_H

5
core/variant_config.h.cmake → core/config/variant_config.h.in
View File

@ -1,8 +1,7 @@
#ifndef CONFIG_H
#define CONFIG_H
#ifndef VARIANT_CONFIG_H
#define VARIANT_CONFIG_H
#cmakedefine BUILD_OVP
#cmakedefine BUILD_BOCHS
#endif