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

Improved CMake generator (#4365)

Browse Source
This commit is contained in:
Mattes D 2019-08-10 13:15:51 +02:00 committed by GitHub
parent d0b095ad51
commit 26d0605121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -71,7 +71,6 @@ Makefile
*.d *.d
*.so *.so
tests/*/*-exe tests/*/*-exe
BuildInfo.h
CMakeCache.txt CMakeCache.txt
CMakeFiles CMakeFiles
Makefile Makefile

2
src/Bindings/ManualBindings.cpp
View File

@ -24,7 +24,7 @@
#include "../BlockEntities/MobHeadEntity.h" #include "../BlockEntities/MobHeadEntity.h"
#include "../BlockEntities/FlowerPotEntity.h" #include "../BlockEntities/FlowerPotEntity.h"
#include "../BoundingBox.h" #include "../BoundingBox.h"
#include "../BuildInfo.h" #include "BuildInfo.h"
#include "../ClientHandle.h" #include "../ClientHandle.h"
#include "../CommandOutput.h" #include "../CommandOutput.h"
#include "../CompositeChat.h" #include "../CompositeChat.h"

9
src/CMakeLists.txt
View File

@ -88,7 +88,6 @@ SET (HDRS
BlockTypeRegistry.h BlockTypeRegistry.h
BrewingRecipes.h BrewingRecipes.h
BoundingBox.h BoundingBox.h
BuildInfo.h
BuildInfo.h.cmake BuildInfo.h.cmake
ByteBuffer.h ByteBuffer.h
ChatColor.h ChatColor.h
@ -169,7 +168,7 @@ include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/sqlite")
include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/SQLiteCpp/include") include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/SQLiteCpp/include")
include_directories (SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/../lib/TCLAP/include") include_directories (SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/../lib/TCLAP/include")
configure_file("BuildInfo.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/BuildInfo.h") configure_file("BuildInfo.h.cmake" "${CMAKE_BINARY_DIR}/include/BuildInfo.h")
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
set_source_files_properties(BlockID.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=global-constructors") set_source_files_properties(BlockID.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=global-constructors")
@ -368,3 +367,9 @@ target_link_libraries(${CMAKE_PROJECT_NAME} luaexpat jsoncpp_lib_static mbedtls
# Create a folder for Bindings' documentation: # Create a folder for Bindings' documentation:
FILE(MAKE_DIRECTORY "Bindings/docs") FILE(MAKE_DIRECTORY "Bindings/docs")
# For MSVC, set the startup project to Cuberite:
if (MSVC)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${CMAKE_PROJECT_NAME})
endif()