projects
/
zefram
/
minetest
/
minetest_engine.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4f53619
)
Move package search out of conditional
author
Giuseppe Bilotta
<giuseppe.bilotta@gmail.com>
Wed, 20 Jul 2011 20:49:48 +0000
(22:49 +0200)
committer
Giuseppe Bilotta
<giuseppe.bilotta@gmail.com>
Wed, 20 Jul 2011 21:09:28 +0000
(23:09 +0200)
This unbreaks the Windows build which would otherwise have problems at
the jthread level.
src/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index e1de23663618ad6bddb22127ae706e3e713575c7..72f79976c6cd700fcf51b5183e80233bf67431d8 100644
(file)
--- 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"