diff options
| author | Mattes D <github@xoft.cz> | 2015-06-03 12:20:34 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-06-03 12:20:34 +0200 |
| commit | d871c4750589091b3a0a34e2f02faa6ebb010b19 (patch) | |
| tree | af63ab6eb439784793e77979b3d11f5f8295dbf0 | |
| parent | Merge pull request #2199 from jan64/master (diff) | |
| parent | CMake: Removed unused legacy LibEvent target. (diff) | |
| download | cuberite-d871c4750589091b3a0a34e2f02faa6ebb010b19.tar cuberite-d871c4750589091b3a0a34e2f02faa6ebb010b19.tar.gz cuberite-d871c4750589091b3a0a34e2f02faa6ebb010b19.tar.bz2 cuberite-d871c4750589091b3a0a34e2f02faa6ebb010b19.tar.lz cuberite-d871c4750589091b3a0a34e2f02faa6ebb010b19.tar.xz cuberite-d871c4750589091b3a0a34e2f02faa6ebb010b19.tar.zst cuberite-d871c4750589091b3a0a34e2f02faa6ebb010b19.zip | |
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ae83662c9..81270438e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() |