clean up cmake

sys-bio · Apr 29, 2014 · aba36b2 · aba36b2
1 parent 9a7455e
commit aba36b2
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 3 deletions.
diff --git 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
@@ -1 +1 @@
-1.2.0
+1.2.0-beta2
diff --git 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 → rr_support/CMakeLists.txt b/third_party/rr_support/CMakeLists.txt → rr_support/CMakeLists.txt
diff --git a/third_party/rr_support/bcc.cfg → rr_support/bcc.cfg b/third_party/rr_support/bcc.cfg → rr_support/bcc.cfg
diff --git a/third_party/rr_support/gurgle.dat → rr_support/gurgle.dat b/third_party/rr_support/gurgle.dat → rr_support/gurgle.dat
diff --git a/third_party/rr_support/rrCExporter.h → rr_support/rrCExporter.h b/third_party/rr_support/rrCExporter.h → rr_support/rrCExporter.h
diff --git a/third_party/rr_support/rrModelData.h → rr_support/rrModelData.h b/third_party/rr_support/rrModelData.h → rr_support/rrModelData.h
diff --git a/third_party/rr_support/rrSupport.c → rr_support/rrSupport.c b/third_party/rr_support/rrSupport.c → rr_support/rrSupport.c
diff --git a/third_party/rr_support/rrSupport.h → rr_support/rrSupport.h b/third_party/rr_support/rrSupport.h → rr_support/rrSupport.h
diff --git a/third_party/rr_support/stdbool.h → rr_support/stdbool.h b/third_party/rr_support/stdbool.h → rr_support/stdbool.h
diff --git 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
@@ -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)