diff options
| author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-19 18:21:29 +0100 |
|---|---|---|
| committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-19 18:21:29 +0100 |
| commit | cb9f30d4eed9a9ad8564104c751884eea1ee787d (patch) | |
| tree | 6d81ca602f6d0df518a5bdfe590e932fc640561c /CMakeLists.txt | |
| parent | modified travis CI file for cmake (diff) | |
| parent | fixed include paths on windows and added build dir to gitignore (diff) | |
| download | cuberite-cb9f30d4eed9a9ad8564104c751884eea1ee787d.tar cuberite-cb9f30d4eed9a9ad8564104c751884eea1ee787d.tar.gz cuberite-cb9f30d4eed9a9ad8564104c751884eea1ee787d.tar.bz2 cuberite-cb9f30d4eed9a9ad8564104c751884eea1ee787d.tar.lz cuberite-cb9f30d4eed9a9ad8564104c751884eea1ee787d.tar.xz cuberite-cb9f30d4eed9a9ad8564104c751884eea1ee787d.tar.zst cuberite-cb9f30d4eed9a9ad8564104c751884eea1ee787d.zip | |
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 77ee23cc8..4201602f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,14 +2,20 @@ cmake_minimum_required (VERSION 2.6) project (MCServer) +if(WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP") +endif() + set(CMAKE_CXX_FLAGS_BAK ${CMAKE_CXX_FLAGS}) set(CMAKE_C_FLAGS_BAK ${CMAKE_C_FLAGS}) if (UNIX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w") else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /w") + #remove /W3 from command line -- cannot just cancel it later with /w like in unix because of D9025 + string(REPLACE "/W3" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REPLACE "/W3" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") endif() set(CMAKE_BUILD_TYPE_BAK ${CMAKE_BUILD_TYPE}) set(CMAKE_BUILD_TYPE "Release") |