aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-20 14:29:01 -0700
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-20 14:29:01 -0700
commitf5c6e3973cfeadead32c8211cbbbe419a9f8922e (patch)
treedb3520b7a0cae1fffde2b077d861563d8ef2e623
parent84684e53edcf319f1aebd69b003ae016173dc485 (diff)
parente7beaac6f549db41e2ee8a342773e1ed502fe8e0 (diff)
downloadminetest-f5c6e3973cfeadead32c8211cbbbe419a9f8922e.tar.gz
minetest-f5c6e3973cfeadead32c8211cbbbe419a9f8922e.tar.bz2
minetest-f5c6e3973cfeadead32c8211cbbbe419a9f8922e.zip
Merge pull request #27 from Oblomov/master
* regression fix for windows build.
-rw-r--r--src/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e1de23663..72f79976c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,8 +43,6 @@ else()
find_package(JPEG REQUIRED)
find_package(BZip2 REQUIRED)
find_package(PNG REQUIRED)
- find_package(Jthread REQUIRED)
- find_package(Sqlite3 REQUIRED)
if(APPLE)
FIND_LIBRARY(CARBON_LIB Carbon)
FIND_LIBRARY(COCOA_LIB Cocoa)
@@ -65,6 +63,9 @@ else()
set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
endif()
+find_package(Jthread REQUIRED)
+find_package(Sqlite3 REQUIRED)
+
configure_file(
"${PROJECT_SOURCE_DIR}/cmake_config.h.in"
"${PROJECT_BINARY_DIR}/cmake_config.h"