gistfile1.diff

From 0561e30a30e718b66776d06618db98505a596ac5 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Thu, 1 Aug 2013 20:53:55 +0300
Subject: [PATCH] Always use in-project jthread, and always use it statically

---
 cmake/Modules/FindJthread.cmake | 18 ------------------
 src/CMakeLists.txt              | 11 +++++------
 src/jthread/CMakeLists.txt      |  3 +--
 3 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 cmake/Modules/FindJthread.cmake

diff --git a/cmake/Modules/FindJthread.cmake b/cmake/Modules/FindJthread.cmake
deleted file mode 100644
index 302a3c2..0000000
--- a/cmake/Modules/FindJthread.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-# Look for jthread, use our own if not found
-
-FIND_PATH(JTHREAD_INCLUDE_DIR jthread.h)
-
-FIND_LIBRARY(JTHREAD_LIBRARY NAMES jthread)
-
-IF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
-       SET( JTHREAD_FOUND TRUE )
-ENDIF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
-
-IF(JTHREAD_FOUND)
-       MESSAGE(STATUS "Found system jthread header file in ${JTHREAD_INCLUDE_DIR}")
-       MESSAGE(STATUS "Found system jthread library ${JTHREAD_LIBRARY}")
-ELSE(JTHREAD_FOUND)
-       SET(JTHREAD_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jthread)
-       SET(JTHREAD_LIBRARY jthread)
-       MESSAGE(STATUS "Using project jthread library")
-ENDIF(JTHREAD_FOUND)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fae23b8..32d067a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,6 @@ cmake_minimum_required( VERSION 2.6 )
 
 # Set some random things default to not being visible in the GUI
 mark_as_advanced(EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH)
-mark_as_advanced(JTHREAD_INCLUDE_DIR JTHREAD_LIBRARY)
 mark_as_advanced(SQLITE3_INCLUDE_DIR SQLITE3_LIBRARY)
builtin                                                          doc                      mods                        screenshot_2357176344.png  worldtest_world
 mark_as_advanced(JSON_INCLUDE_DIR JSON_LIBRARY)

@@ -169,7 +168,6 @@ else()
        set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
 endif()

-find_package(Jthread REQUIRED)
 find_package(Sqlite3 REQUIRED)
 find_package(Json REQUIRED)
 find_package(OpenGLES2)
@@ -201,6 +199,10 @@ endif(LUA_LIBRARY AND LUA_INCLUDE_DIR)
 mark_as_advanced(LUA_LIBRARY)
 mark_as_advanced(LUA_INCLUDE_DIR)

+# JThread is Minetest's modified fork; do not use global search.
+SET(JTHREAD_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jthread)
+SET(JTHREAD_LIBRARY jthread)
+
 configure_file(
        "${PROJECT_SOURCE_DIR}/cmake_config.h.in"
        "${PROJECT_BINARY_DIR}/cmake_config.h"
@@ -592,10 +594,7 @@ endif(USE_GETTEXT)
 
 # Subdirectories

-if (JTHREAD_FOUND)
-else (JTHREAD_FOUND)
-       add_subdirectory(jthread)
-endif (JTHREAD_FOUND)
+add_subdirectory(jthread)
 
 if (SQLITE3_FOUND)
 else (SQLITE3_FOUND)
diff --git a/src/jthread/CMakeLists.txt b/src/jthread/CMakeLists.txt
index be38f87..660b781 100644
--- a/src/jthread/CMakeLists.txt
+++ b/src/jthread/CMakeLists.txt
@@ -6,11 +6,10 @@ else( UNIX )
        set(jthread_platform_LIBS "")
 endif( UNIX )

-add_library(jthread ${jthread_SRCS})
+add_library(jthread STATIC ${jthread_SRCS})
 
 target_link_libraries(
        jthread
        ${jthread_platform_LIBS}
 )

-
--
1.7.12