flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #2202 from mc-server/CmakeCleanup

Browse Source 
Cmake cleanup
This commit is contained in:
Mattes D 2015-06-03 12:20:34 +02:00
commit d871c47505
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -3,6 +3,11 @@ cmake_minimum_required (VERSION 2.8.7)
# Without this, the MSVC variable isn't defined for MSVC builds ( http://www.cmake.org/pipermail/cmake/2011-November/047130.html )
enable_language(CXX C)
# Enable the support for solution folders in MSVC
if (MSVC)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
endif()
# These env variables are used for configuring Travis CI builds.
# See https://github.com/mc-server/MCServer/pull/767
if(DEFINED ENV{TRAVIS_MCSERVER_BUILD_TYPE})
@ -130,7 +135,7 @@ add_subdirectory(lib/sqlite/)
add_subdirectory(lib/SQLiteCpp/)
add_subdirectory(lib/expat/)
add_subdirectory(lib/luaexpat/)
add_subdirectory(lib/libevent/)
add_subdirectory(lib/libevent/ EXCLUDE_FROM_ALL)
# Add proper include directories so that SQLiteCpp can find SQLite3:
get_property(SQLITECPP_INCLUDES DIRECTORY "lib/SQLiteCpp/" PROPERTY INCLUDE_DIRECTORIES)
@ -160,3 +165,12 @@ if(${SELF_TEST})
add_subdirectory (tests)
endif()
# Put project into solution folders in MSVC:
if (MSVC)
set_target_properties(event_core event_extra expat jsoncpp lua luaexpat mbedtls sqlite SQLiteCpp tolualib zlib PROPERTIES FOLDER Lib)
set_target_properties(luaproxy tolua PROPERTIES FOLDER Support)
if (${SELF_TEST})
set_target_properties(Network PROPERTIES FOLDER Lib)
set_target_properties(arraystocoords-exe coordinates-exe copies-exe copyblocks-exe creatable-exe EchoServer Google-exe ChunkBuffer NameLookup PROPERTIES FOLDER Tests)
endif()
endif()