From b2353078bc0592c2eb1f6a196e59538ca30b9d18 Mon Sep 17 00:00:00 2001 From: hsc Date: Tue, 3 Jul 2012 13:27:01 +0000 Subject: [PATCH] add cmake configuration for additional ag++ flags git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1412 8c4709b5-6ec9-48aa-a5cd-a96041d1645a --- cmake/bochs.cmake | 2 +- cmake/compilerconfig.cmake | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/bochs.cmake b/cmake/bochs.cmake index b6d15a50..81c63a53 100644 --- a/cmake/bochs.cmake +++ b/cmake/bochs.cmake @@ -71,7 +71,7 @@ if(BUILD_BOCHS) set(bochs_src_dir ${PROJECT_SOURCE_DIR}/simulators/bochs) add_custom_command(OUTPUT "${bochs_src_dir}/libfailbochs.a" - COMMAND +make -C ${bochs_src_dir} CXX=\"ag++ -p ${PROJECT_SOURCE_DIR} -I${PROJECT_SOURCE_DIR}/src/core -I${CMAKE_BINARY_DIR}/src/core --real-instances --Xcompiler\" LIBTOOL=\"/bin/sh ./libtool --tag=CXX\" libfailbochs.a + COMMAND +make -C ${bochs_src_dir} CXX=\"ag++ -p ${PROJECT_SOURCE_DIR} -I${PROJECT_SOURCE_DIR}/src/core -I${CMAKE_BINARY_DIR}/src/core ${CMAKE_AGPP_FLAGS} --Xcompiler\" LIBTOOL=\"/bin/sh ./libtool --tag=CXX\" libfailbochs.a COMMENT "[${PROJECT_NAME}] Building libfailbochs" ) diff --git a/cmake/compilerconfig.cmake b/cmake/compilerconfig.cmake index 5cb9ca91..c656c54b 100644 --- a/cmake/compilerconfig.cmake +++ b/cmake/compilerconfig.cmake @@ -17,8 +17,9 @@ elseif(${COMPILER} STREQUAL "gcc") elseif(${COMPILER} STREQUAL "ag++") set(CMAKE_C_COMPILER "ag++") set(CMAKE_CXX_COMPILER "ag++") + set(CMAKE_AGPP_FLAGS "--real-instances" CACHE STRING "Additional ag++ flags, e.g. --real-instances --keep_woven") ## Here we add the build dir holding the generated header files (protobuf) - add_definitions("-p ${CMAKE_SOURCE_DIR} --real-instances --Xcompiler" ) + add_definitions("-p ${CMAKE_SOURCE_DIR} ${CMAKE_AGPP_FLAGS} --Xcompiler") else(${COMPILER} STREQUAL "clang") message(FATAL_ERROR "COMPILER must be exactly one of clang/gcc/ag++. If unsure, use 'ag++'.")