From 63a8c10f84d425872849897562acc094500c3de7 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 4 May 2013 17:29:39 -0700
Subject: [PATCH] split the cflags settings over more files

---
 .gitmodules        | 3 +++
 CMakeLists.txt     | 6 ++++++
 cJSON              | 1 +
 cutest             | 2 +-
 eressea            | 2 +-
 iniparser          | 2 +-
 src/CMakeLists.txt | 3 ---
 7 files changed, 13 insertions(+), 6 deletions(-)
 create mode 160000 cJSON

diff --git a/.gitmodules b/.gitmodules
index 7b1ee285a..132d071ea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "lunit"]
 	path = lunit
 	url = git@github.com:eressea/lunit.git
+[submodule "cJSON"]
+	path = cJSON
+	url = git://github.com/kbranigan/cJSON.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eacd1bc1c..38c0cdbb3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,12 @@ project (e3-server C)
 
 enable_testing()
 
+IF(CMAKE_COMPILER_IS_GNUCC)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -DHAVE__BOOL")
+ELSE(CMAKE_COMPILER_IS_GNUCC)
+    MESSAGE(STATUS "Unknown compiler ${CMAKE_C_COMPILER_ID}")
+ENDIF(CMAKE_COMPILER_IS_GNUCC)
+
 find_package (Lua 5 REQUIRED)
 find_package (ToLua REQUIRED)
 find_package (LibXml2 REQUIRED)
diff --git a/cJSON b/cJSON
new file mode 160000
index 000000000..43241a78d
--- /dev/null
+++ b/cJSON
@@ -0,0 +1 @@
+Subproject commit 43241a78df3abc76ad7fc3d80f81e0b1db83a890
diff --git a/cutest b/cutest
index b5910573d..30c0fed28 160000
--- a/cutest
+++ b/cutest
@@ -1 +1 @@
-Subproject commit b5910573d0b7da7f46c3efbaeb85cb2eaf269980
+Subproject commit 30c0fed288ef280b27ff49912da03be6eaf90ca7
diff --git a/eressea b/eressea
index 1db73ac4c..b0fb81640 160000
--- a/eressea
+++ b/eressea
@@ -1 +1 @@
-Subproject commit 1db73ac4c7fc135e97debe27b246c9f81e0c03c6
+Subproject commit b0fb81640bbb6f1607546d6db1342253154f4f75
diff --git a/iniparser b/iniparser
index f412ae545..537ba2f17 160000
--- a/iniparser
+++ b/iniparser
@@ -1 +1 @@
-Subproject commit f412ae545c1465e4128075790dfda79f3c3de604
+Subproject commit 537ba2f174d51cb06c3a97a1a0285b384b0e3d1a
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0eb069c74..cb935674a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,9 +3,6 @@ project (server C)
 
 IF(CMAKE_COMPILER_IS_GNUCC)
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wall -Werror -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith -Wno-char-subscripts -Wno-long-long")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -DHAVE__BOOL")
-ELSE(CMAKE_COMPILER_IS_GNUCC)
-    MESSAGE(STATUS "Unknown compiler ${CMAKE_C_COMPILER_ID}")
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 include_directories (${ERESSEA_INCLUDE_DIR})