diff options
| author | Mattes D <github@xoft.cz> | 2015-08-26 10:58:51 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-09-05 22:01:21 +0200 |
| commit | dac97826f7d0c9b9135c1a08c4d5f16b61494bd1 (patch) | |
| tree | ec17a9703fe734956e4f151cb5306befc4fd7571 /src | |
| parent | Merge pull request #2459 from cuberite/fixes (diff) | |
| download | cuberite-dac97826f7d0c9b9135c1a08c4d5f16b61494bd1.tar cuberite-dac97826f7d0c9b9135c1a08c4d5f16b61494bd1.tar.gz cuberite-dac97826f7d0c9b9135c1a08c4d5f16b61494bd1.tar.bz2 cuberite-dac97826f7d0c9b9135c1a08c4d5f16b61494bd1.tar.lz cuberite-dac97826f7d0c9b9135c1a08c4d5f16b61494bd1.tar.xz cuberite-dac97826f7d0c9b9135c1a08c4d5f16b61494bd1.tar.zst cuberite-dac97826f7d0c9b9135c1a08c4d5f16b61494bd1.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 03dfc76db..a9e1a6606 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required (VERSION 2.8.2) -project (MCServer) +project (Cuberite) include_directories (SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/../lib/") @@ -301,12 +301,12 @@ endforeach() FILE(WRITE "AllFiles.lst" "${ALLFILESLINES}") -set(EXECUTABLE MCServer) +set(EXECUTABLE Cuberite) if (MSVC) get_directory_property(BINDING_OUTPUTS DIRECTORY "Bindings" DEFINITION BINDING_OUTPUTS) get_directory_property(BINDING_DEPENDENCIES DIRECTORY "Bindings" DEFINITION BINDING_DEPENDENCIES) - + # The paths in BINDING_DEPENDENCIES are relative to the Bindings folder, convert them relative to this folder: foreach (dep ${BINDING_DEPENDENCIES}) list (APPEND BINDINGS_DEPENDENCIES "Bindings/${dep}") @@ -331,12 +331,12 @@ add_executable(${EXECUTABLE} ${SOURCE}) # Output the executable into the $/MCServer folder, so that it has access to external resources: -set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/MCServer) +set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/Server) SET_TARGET_PROPERTIES(${EXECUTABLE} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/MCServer - RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/MCServer - RUNTIME_OUTPUT_DIRECTORY_DEBUGPROFILE ${CMAKE_SOURCE_DIR}/MCServer - RUNTIME_OUTPUT_DIRECTORY_RELEASEPROFILE ${CMAKE_SOURCE_DIR}/MCServer + RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/Server + RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/Server + RUNTIME_OUTPUT_DIRECTORY_DEBUGPROFILE ${CMAKE_SOURCE_DIR}/Server + RUNTIME_OUTPUT_DIRECTORY_RELEASEPROFILE ${CMAKE_SOURCE_DIR}/Server ) |