christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Revert "explicit aspect activation"

Browse Source 
Unfortunately, this does not (yet) work as advertised.  I need to fight another
round of CMake battles before retrying.  Reverting to previous state for now.

This reverts r1753.

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1767 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-10-19 09:45:00 +00:00
parent e05e80d285
commit a911ebb353
47 changed files with 201 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/compilerconfig.cmake
View File

@ -18,12 +18,8 @@ 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")
foreach(aspect_header ${CMAKE_ASPECT_HEADERS})
list(APPEND AGPP_ASPECTLIST -a ${aspect_header})
endforeach(aspect_header)
set(AGPP_PARAMETERS ${AGPP_ASPECTLIST} -p ${CMAKE_SOURCE_DIR} ${CMAKE_AGPP_FLAGS})
unset(AGPP_ASPECTLIST)
add_definitions(${AGPP_PARAMETERS} --Xcompiler)
## Here we add the build dir holding the generated header files (protobuf)
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++'.")