From aba36b2b8cb414fedb850384e3e64722fd22c849 Mon Sep 17 00:00:00 2001 From: Andy Somogyi - odin Date: Tue, 29 Apr 2014 15:39:42 -0400 Subject: [PATCH] clean up cmake --- CMakeLists.txt | 5 +++++ VERSION.txt | 2 +- cmake/FindLLVM.cmake | 16 ++++++++++++++++ .../rr_support => rr_support}/CMakeLists.txt | 0 {third_party/rr_support => rr_support}/bcc.cfg | 0 .../rr_support => rr_support}/gurgle.dat | 0 .../rr_support => rr_support}/rrCExporter.h | 0 .../rr_support => rr_support}/rrModelData.h | 0 .../rr_support => rr_support}/rrSupport.c | 0 .../rr_support => rr_support}/rrSupport.h | 0 {third_party/rr_support => rr_support}/stdbool.h | 0 source/rrVersionInfo.h | 2 +- third_party/CMakeLists.txt | 2 +- 13 files changed, 24 insertions(+), 3 deletions(-) rename {third_party/rr_support => rr_support}/CMakeLists.txt (100%) rename {third_party/rr_support => rr_support}/bcc.cfg (100%) rename {third_party/rr_support => rr_support}/gurgle.dat (100%) rename {third_party/rr_support => rr_support}/rrCExporter.h (100%) rename {third_party/rr_support => rr_support}/rrModelData.h (100%) rename {third_party/rr_support => rr_support}/rrSupport.c (100%) rename {third_party/rr_support => rr_support}/rrSupport.h (100%) rename {third_party/rr_support => rr_support}/stdbool.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 921cc6fc0b..d15acce301 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -247,6 +247,11 @@ endif(BUILD_LEGACY_C) # We alway have to build the roadrunner core, everything depends on this add_subdirectory(source) +# install the rr_support if building legacy c +if(BUILD_LEGACY_C) + add_subdirectory(rr_support) +endif(BUILD_LEGACY_C) + if(INSTALL_CXX_API) if(INSTALL_APPS) add_subdirectory(apps) diff --git a/VERSION.txt b/VERSION.txt index 26aaba0e86..27ec031fe9 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -1.2.0 +1.2.0-beta2 diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake index 753ad6549d..1e228e49b2 100644 --- a/cmake/FindLLVM.cmake +++ b/cmake/FindLLVM.cmake @@ -124,6 +124,22 @@ if (LLVM_CONFIG_EXECUTABLE) STRING(REPLACE "-Wcast-qual" "" LLVM_DEFINITIONS ${LLVM_DEFINITIONS}) STRING(REPLACE "-Woverloaded-virtual" "" LLVM_DEFINITIONS ${LLVM_DEFINITIONS}) + # some LLVMs add these options + # -Wall -W -Wno-unused-parameter -Wwrite-strings -Wno-missing-field-initializers -pedantic + # -Wno-long-long -Wno-uninitialized -Wnon-virtual-dtor + + + STRING(REPLACE "-Wall" "" LLVM_DEFINITIONS ${LLVM_DEFINITIONS}) + STRING(REPLACE "-W " "" LLVM_DEFINITIONS ${LLVM_DEFINITIONS}) + STRING(REPLACE "-Wno-unused-parameter" "" LLVM_DEFINITIONS ${LLVM_DEFINITIONS}) + STRING(REPLACE "-Wwrite-strings" "" LLVM_DEFINITIONS ${LLVM_DEFINITIONS}) + STRING(REPLACE "-Wno-missing-field-initializers" "" LLVM_DEFINITIONS ${LLVM_DEFINITIONS}) + STRING(REPLACE "-pedantic" "" LLVM_DEFINITIONS ${LLVM_DEFINITIONS}) + STRING(REPLACE "-Wno-long-long" "" LLVM_DEFINITIONS ${LLVM_DEFINITIONS}) + STRING(REPLACE "-Wno-uninitialized" "" LLVM_DEFINITIONS ${LLVM_DEFINITIONS}) + STRING(REPLACE "-Wnon-virtual-dtor" "" LLVM_DEFINITIONS ${LLVM_DEFINITIONS}) + + MESSAGE(STATUS "LLVM_DEFINITIONS: " ${LLVM_DEFINITIONS}) diff --git a/third_party/rr_support/CMakeLists.txt b/rr_support/CMakeLists.txt similarity index 100% rename from third_party/rr_support/CMakeLists.txt rename to rr_support/CMakeLists.txt diff --git a/third_party/rr_support/bcc.cfg b/rr_support/bcc.cfg similarity index 100% rename from third_party/rr_support/bcc.cfg rename to rr_support/bcc.cfg diff --git a/third_party/rr_support/gurgle.dat b/rr_support/gurgle.dat similarity index 100% rename from third_party/rr_support/gurgle.dat rename to rr_support/gurgle.dat diff --git a/third_party/rr_support/rrCExporter.h b/rr_support/rrCExporter.h similarity index 100% rename from third_party/rr_support/rrCExporter.h rename to rr_support/rrCExporter.h diff --git a/third_party/rr_support/rrModelData.h b/rr_support/rrModelData.h similarity index 100% rename from third_party/rr_support/rrModelData.h rename to rr_support/rrModelData.h diff --git a/third_party/rr_support/rrSupport.c b/rr_support/rrSupport.c similarity index 100% rename from third_party/rr_support/rrSupport.c rename to rr_support/rrSupport.c diff --git a/third_party/rr_support/rrSupport.h b/rr_support/rrSupport.h similarity index 100% rename from third_party/rr_support/rrSupport.h rename to rr_support/rrSupport.h diff --git a/third_party/rr_support/stdbool.h b/rr_support/stdbool.h similarity index 100% rename from third_party/rr_support/stdbool.h rename to rr_support/stdbool.h diff --git a/source/rrVersionInfo.h b/source/rrVersionInfo.h index 3c9b3417bd..7e6afd7955 100644 --- a/source/rrVersionInfo.h +++ b/source/rrVersionInfo.h @@ -10,7 +10,7 @@ namespace rr { #define RR_VERSION_MAJOR 1 #define RR_VERSION_MINOR 2 #define RR_VERSION_PATCH 0 -#define RR_VERSION_STR "1.2.0-beta1" +#define RR_VERSION_STR "1.2.0-beta2" #define RR_STRINGIZE2(s) #s #define RR_STRINGIZE(s) RR_STRINGIZE2(s) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index e4edf37ab9..eb221cbd6f 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -152,7 +152,7 @@ add_subdirectory(nleq) add_subdirectory(rr-libstruct) add_subdirectory(unit_test) add_subdirectory(poco_1.5.3) -add_subdirectory(rr_support) + if(WIN32) add_subdirectory(compilers)