Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake

src/3rdparty/CMakeLists.txt

@@ -0,0 +1,5 @@
+add_subdirectory(md5)
+add_subdirectory(squirrel)
+add_subdirectory(os2)
+add_subdirectory(cpp-btree)
+add_subdirectory(mingw-std-threads)

src/3rdparty/cpp-btree/CMakeLists.txt

@@ -0,0 +1,9 @@
+add_files(
+    btree.h
+    btree_container.h
+    btree_map.h
+    btree_set.h
+    safe_btree.h
+    safe_btree_map.h
+    safe_btree_set.h
+)

src/3rdparty/md5/CMakeLists.txt

@@ -0,0 +1,4 @@
+add_files(
+    md5.cpp
+    md5.h
+)

src/3rdparty/mingw-std-threads/CMakeLists.txt

@@ -0,0 +1,7 @@
+add_files(
+    mingw.condition_variable.h
+    mingw.mutex.h
+    mingw.shared_mutex.h
+    mingw.thread.h
+    CONDITION MINGW
+)

src/3rdparty/os2/CMakeLists.txt

@@ -0,0 +1,7 @@
+add_files(
+    getaddrinfo.c
+    getaddrinfo.h
+    getnameinfo.c
+    getnameinfo.h
+    CONDITION OPTION_OS2
+)

src/3rdparty/squirrel/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_subdirectory(include)
+add_subdirectory(sqstdlib)
+add_subdirectory(squirrel)

src/3rdparty/squirrel/include/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_files(
+    sqstdaux.h
+    sqstdmath.h
+    sqstdstring.h
+    squirrel.h
+)

src/3rdparty/squirrel/sqstdlib/CMakeLists.txt

@@ -0,0 +1,4 @@
+add_files(
+    sqstdaux.cpp
+    sqstdmath.cpp
+)

src/3rdparty/squirrel/squirrel/CMakeLists.txt

@@ -0,0 +1,30 @@
+add_files(
+    sqapi.cpp
+    sqarray.h
+    sqbaselib.cpp
+    sqclass.cpp
+    sqclass.h
+    sqclosure.h
+    sqcompiler.cpp
+    sqcompiler.h
+    sqdebug.cpp
+    sqfuncproto.h
+    sqfuncstate.cpp
+    sqfuncstate.h
+    sqlexer.cpp
+    sqlexer.h
+    sqmem.cpp
+    sqobject.cpp
+    sqobject.h
+    sqopcodes.h
+    sqpcheader.h
+    sqstate.cpp
+    sqstate.h
+    sqstring.h
+    sqtable.cpp
+    sqtable.h
+    squserdata.h
+    squtils.h
+    sqvm.cpp
+    sqvm.h
+)

src/3rdparty/squirrel/squirrel/sqcompiler.h

@@ -72,7 +72,7 @@ struct SQVM;
 #define TK_CONST 324
 
 /* MSVC doesn't like NORETURN for function prototypes, but we kinda need it for GCC. */
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(__clang__)
 typedef void(*CompilerErrorFunc)(void *ud, const SQChar *s);
 #else
 typedef NORETURN void(*CompilerErrorFunc)(void *ud, const SQChar *s);