diff options
| author | Mattes D <github@xoft.cz> | 2014-01-02 18:16:11 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-01-02 18:16:11 +0100 |
| commit | d3dc12815b2ecf9ec26e28d1a1121d8114d1789c (patch) | |
| tree | 0bfe5a0f498c1626131b61a05903b2c5d9820eff /src/CMakeLists.txt | |
| parent | More memory alignment fixes. (diff) | |
| parent | Merge branch 'master' into cmake-win (diff) | |
| download | cuberite-d3dc12815b2ecf9ec26e28d1a1121d8114d1789c.tar cuberite-d3dc12815b2ecf9ec26e28d1a1121d8114d1789c.tar.gz cuberite-d3dc12815b2ecf9ec26e28d1a1121d8114d1789c.tar.bz2 cuberite-d3dc12815b2ecf9ec26e28d1a1121d8114d1789c.tar.lz cuberite-d3dc12815b2ecf9ec26e28d1a1121d8114d1789c.tar.xz cuberite-d3dc12815b2ecf9ec26e28d1a1121d8114d1789c.tar.zst cuberite-d3dc12815b2ecf9ec26e28d1a1121d8114d1789c.zip | |
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 88e469b74..bd06798ff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,7 @@ set(FOLDERS ${FOLDERS} WorldStorage Mobs Entities Simulator UI BlockEntities) -if (NOT WIN32) +if (NOT MSVC) foreach(folder ${FOLDERS}) add_subdirectory(${folder}) endforeach(folder) @@ -62,18 +62,25 @@ else () endif() -if (UNIX) - set(EXECUTABLE ../MCServer/MCServer) -else () - set(EXECUTABLE MCServer) -endif () - +set(EXECUTABLE MCServer) add_executable(${EXECUTABLE} ${SOURCE}) +set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/MCServer) + +if (MSVC) + # MSVC generator adds a "Debug" or "Release" postfixes to the EXECUTABLE_OUTPUT_PATH, we need to cancel them: + SET_TARGET_PROPERTIES(${EXECUTABLE} PROPERTIES PREFIX "../") + SET_TARGET_PROPERTIES(${EXECUTABLE} PROPERTIES IMPORT_PREFIX "../") +endif() + + +# Make the debug executable have a "_debug" suffix +SET_TARGET_PROPERTIES(${EXECUTABLE} PROPERTIES DEBUG_POSTFIX "_debug") + # Precompiled headers (2nd part) -if (WIN32) +if (MSVC) SET_TARGET_PROPERTIES( ${EXECUTABLE} PROPERTIES COMPILE_FLAGS "/Yu\"Globals.h\"" OBJECT_DEPENDS "$(IntDir)/$(TargetName.pch)" @@ -81,7 +88,7 @@ if (WIN32) endif () -if (NOT WIN32) +if (NOT MSVC) target_link_libraries(${EXECUTABLE} OSSupport HTTPServer Bindings Items Blocks) target_link_libraries(${EXECUTABLE} Protocol Generating WorldStorage) target_link_libraries(${EXECUTABLE} Mobs Entities Simulator UI BlockEntities) |