oerkki/minetest
oerkki
/
minetest
2
1
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Move package search out of conditional 

This unbreaks the Windows build which would otherwise have problems at
the jthread level.
This commit is contained in:
Giuseppe Bilotta 2011-07-20 22:49:48 +02:00
parent af4b532c9e
commit 29aae3dcb5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/CMakeLists.txt
View File

@ -43,8 +43,6 @@ else()
find_package(JPEG REQUIRED) find_package(JPEG REQUIRED)
find_package(BZip2 REQUIRED) find_package(BZip2 REQUIRED)
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
find_package(Jthread REQUIRED)
find_package(Sqlite3 REQUIRED)
if(APPLE) if(APPLE)
FIND_LIBRARY(CARBON_LIB Carbon) FIND_LIBRARY(CARBON_LIB Carbon)
FIND_LIBRARY(COCOA_LIB Cocoa) FIND_LIBRARY(COCOA_LIB Cocoa)
@ -65,6 +63,9 @@ else()
set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY}) set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
endif() endif()
find_package(Jthread REQUIRED)
find_package(Sqlite3 REQUIRED)
configure_file( configure_file(
"${PROJECT_SOURCE_DIR}/cmake_config.h.in" "${PROJECT_SOURCE_DIR}/cmake_config.h.in"
"${PROJECT_BINARY_DIR}/cmake_config.h" "${PROJECT_BINARY_DIR}/cmake_config.h"