From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Wed, 20 Jul 2011 20:49:48 +0000 (+0200)
Subject: Move package search out of conditional
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=e7beaac6f549db41e2ee8a342773e1ed502fe8e0;p=zefram%2Fminetest%2Fminetest_engine.git

Move package search out of conditional

This unbreaks the Windows build which would otherwise have problems at
the jthread level.
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e1de2366..72f79976 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"