christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

CMake: Cleanup unnecessary compiler config

Browse Source
This commit is contained in:
Martin Hoffmann
2013-03-20 17:15:54 +01:00
parent 739a62c60b
commit f676a785f8
3 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -53,12 +53,9 @@ elseif(BUILD_QEMU)
elseif(BUILD_T32) elseif(BUILD_T32)
include_directories(debuggers/t32/include src/core) include_directories(debuggers/t32/include src/core)
add_subdirectory(debuggers/t32) add_subdirectory(debuggers/t32)
add_subdirectory(scripts/t32cmm)
endif(BUILD_BOCHS) endif(BUILD_BOCHS)
## Additional compiler and linker flags ##
set(CMAKE_C_FLAGS "-g -Wall")
set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "-Wl,-gc-sections")
## Tell the linker where to find the Fail* libraries ## Tell the linker where to find the Fail* libraries
link_directories("${LIBRARY_OUTPUT_PATH}") link_directories("${LIBRARY_OUTPUT_PATH}")

28
cmake/compilerconfig.cmake
View File

@ -2,28 +2,16 @@
option( VERBOSE_MAKE "Verbose Makefile output" OFF) # defaults to OFF option( VERBOSE_MAKE "Verbose Makefile output" OFF) # defaults to OFF
set(CMAKE_VERBOSE_MAKEFILE ${VERBOSE_MAKE}) set(CMAKE_VERBOSE_MAKEFILE ${VERBOSE_MAKE})
### Additional compiler and linker flags ##
set(CMAKE_C_FLAGS "-g -Wall")
set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "-Wl,-gc-sections")
##### Compilers ##### set(CMAKE_C_COMPILER "gcc")
SET( COMPILER "ag++" CACHE STRING "Use clang/gcc/ag++") # Defaults to ag++ set(CMAKE_CXX_COMPILER "ag++")
set(CMAKE_AGPP_FLAGS "--real-instances" CACHE STRING "Additional ag++ flags, e.g. --real-instances --keep_woven")
if(${COMPILER} STREQUAL "clang")
set(CMAKE_C_COMPILER "clang")
set(CMAKE_CXX_COMPILER "clang++")
elseif(${COMPILER} STREQUAL "gcc")
set(CMAKE_C_COMPILER "gcc")
set(CMAKE_CXX_COMPILER "g++")
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) ## Here we add the build dir holding the generated header files (protobuf)
add_definitions("-p ${CMAKE_SOURCE_DIR}" ${CMAKE_AGPP_FLAGS} --Xcompiler) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --Xweaver -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++'.")
endif(${COMPILER} STREQUAL "clang")
add_definitions(-D_FILE_OFFSET_BITS=64) add_definitions(-D_FILE_OFFSET_BITS=64)

1
src/experiments/kesorefs/experiment.hpp
View File

@ -7,6 +7,7 @@
#include "efw/JobClient.hpp" #include "efw/JobClient.hpp"
#include "util/Logger.hpp" #include "util/Logger.hpp"
#include "util/ElfReader.hpp" #include "util/ElfReader.hpp"
#include "util/Disassembler.hpp"
#include <string> #include <string>
class KESOrefs : public fail::ExperimentFlow { class KESOrefs : public fail::ExperimentFlow {