diff options
| author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-22 16:21:34 +0100 |
|---|---|---|
| committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-22 16:21:34 +0100 |
| commit | 1a9d93665f9f82ccd9054aa1c8e9c24f13776a91 (patch) | |
| tree | e9572b3fdf1d47c0769a3d43d3fc4dfac68fd0dd /lib | |
| parent | basic threadsafe queue interface (diff) | |
| parent | Update GETTING-STARTED.md (diff) | |
| download | cuberite-1a9d93665f9f82ccd9054aa1c8e9c24f13776a91.tar cuberite-1a9d93665f9f82ccd9054aa1c8e9c24f13776a91.tar.gz cuberite-1a9d93665f9f82ccd9054aa1c8e9c24f13776a91.tar.bz2 cuberite-1a9d93665f9f82ccd9054aa1c8e9c24f13776a91.tar.lz cuberite-1a9d93665f9f82ccd9054aa1c8e9c24f13776a91.tar.xz cuberite-1a9d93665f9f82ccd9054aa1c8e9c24f13776a91.tar.zst cuberite-1a9d93665f9f82ccd9054aa1c8e9c24f13776a91.zip | |
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/expat/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | lib/lua/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | lib/sqlite/CMakeLists.txt | 15 |
3 files changed, 36 insertions, 9 deletions
diff --git a/lib/expat/CMakeLists.txt b/lib/expat/CMakeLists.txt index df9e8d57c..667804b9a 100644 --- a/lib/expat/CMakeLists.txt +++ b/lib/expat/CMakeLists.txt @@ -2,10 +2,15 @@ cmake_minimum_required (VERSION 2.6) project (expat) -include_directories ("${PROJECT_SOURCE_DIR}/../../src/") - file(GLOB SOURCE "*.c" ) +# add headers to MSVC project files: +if (WIN32) + file(GLOB HEADERS "*.h") + set(SOURCE ${SOURCE} ${HEADERS}) + source_group("Sources" FILES ${SOURCE}) +endif() + add_library(expat ${SOURCE}) diff --git a/lib/lua/CMakeLists.txt b/lib/lua/CMakeLists.txt index 4787b6aa6..63ac18e90 100644 --- a/lib/lua/CMakeLists.txt +++ b/lib/lua/CMakeLists.txt @@ -8,12 +8,23 @@ file(GLOB SOURCE "src/*.c" ) -if(${STATIC_LUA}) -add_library(lua ${SOURCE}) +list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/src/lua.c" "${PROJECT_SOURCE_DIR}/src/luac.c") + +# add headers to MSVC project files: +if (WIN32) + file(GLOB HEADERS "src/*.h") + list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/src/lua.h" "${PROJECT_SOURCE_DIR}/src/luac.h") + set(SOURCE ${SOURCE} ${HEADERS}) + source_group("Sources" FILES ${SOURCE}) +endif() + +# Lua needs to be linked dynamically on Windows and statically on *nix, so that LuaRocks work +if (WIN32) + add_library(lua SHARED ${SOURCE}) else() -add_library(lua SHARED ${SOURCE}) + add_library(lua ${SOURCE}) endif() -if(UNIX) -target_link_libraries(lua m dl) +if (UNIX) + target_link_libraries(lua m dl) endif() diff --git a/lib/sqlite/CMakeLists.txt b/lib/sqlite/CMakeLists.txt index 8596e2d9c..07e5a22cb 100644 --- a/lib/sqlite/CMakeLists.txt +++ b/lib/sqlite/CMakeLists.txt @@ -2,13 +2,24 @@ cmake_minimum_required (VERSION 2.6) project (sqlite) -include_directories ("${PROJECT_SOURCE_DIR}/../../src/") include_directories ("${PROJECT_SOURCE_DIR}/../") file(GLOB SOURCE "*.c" ) + +# add headers to MSVC project files: +if (WIN32) + file(GLOB HEADERS "src/*.h") + list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/src/lua.h" "${PROJECT_SOURCE_DIR}/src/luac.h") + set(SOURCE ${SOURCE} ${HEADERS}) + source_group("Sources" FILES ${SOURCE}) +endif() + + add_library(sqlite ${SOURCE}) -target_link_libraries(sqlite dl) +if (UNIX) + target_link_libraries(sqlite dl) +endif() |