diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-20 14:29:01 -0700 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-20 14:29:01 -0700 |
| commit | bca3de3d0847bd5b27436dbe9cc580def837c4e0 (patch) | |
| tree | abd48aa08a3a6d2653d6650c77175f558af1ebae | |
| parent | 8129d16dd3f7e5575c444b4792e667a1e3df98e2 (diff) | |
| parent | 29aae3dcb504cea2f8e5a7c0e9085e5223b1c32d (diff) | |
| download | minetest-bca3de3d0847bd5b27436dbe9cc580def837c4e0.tar.gz minetest-bca3de3d0847bd5b27436dbe9cc580def837c4e0.tar.bz2 minetest-bca3de3d0847bd5b27436dbe9cc580def837c4e0.zip | |
Merge pull request #27 from Oblomov/master
* regression fix for windows build.
| -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" |