diff options
| author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2011-07-20 22:49:48 +0200 |
|---|---|---|
| committer | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2011-07-20 23:09:28 +0200 |
| commit | e7beaac6f549db41e2ee8a342773e1ed502fe8e0 (patch) | |
| tree | 7af4fdb48564fa884c5e4cd44fe2298cacc40e8e | |
| parent | 4f53619a15cd5a1cd18e8e3eb7c5eb21608b460e (diff) | |
| download | minetest-e7beaac6f549db41e2ee8a342773e1ed502fe8e0.tar.gz minetest-e7beaac6f549db41e2ee8a342773e1ed502fe8e0.tar.bz2 minetest-e7beaac6f549db41e2ee8a342773e1ed502fe8e0.zip | |
Move package search out of conditional
This unbreaks the Windows build which would otherwise have problems at
the jthread level.
| -rw-r--r-- | src/CMakeLists.txt | 5 |
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" |