MSVC CMake Updates (#5012)
* Silence C4506 Warnings on MSVC CMake builds * Silence CMake 'installing' messages on AppVeyor buildsmaster
parent
1e5e1d3a62
commit
6598f7fada
|
@ -8,6 +8,7 @@ cmake -G Ninja^
|
||||||
-DCMAKE_INSTALL_PREFIX="C:/Program Files/Pioneer"^
|
-DCMAKE_INSTALL_PREFIX="C:/Program Files/Pioneer"^
|
||||||
-DPIONEER_DATA_DIR="C:/Program Files/Pioneer/data"^
|
-DPIONEER_DATA_DIR="C:/Program Files/Pioneer/data"^
|
||||||
-DCMAKE_BUILD_TYPE:STRING=Release^
|
-DCMAKE_BUILD_TYPE:STRING=Release^
|
||||||
|
-DCMAKE_INSTALL_MESSAGE=NEVER^
|
||||||
-DGIT_EXECUTABLE="c:/Program Files/Git/cmd/git.exe"^
|
-DGIT_EXECUTABLE="c:/Program Files/Git/cmd/git.exe"^
|
||||||
c:\projects\pioneer || goto error
|
c:\projects\pioneer || goto error
|
||||||
|
|
||||||
|
|
|
@ -40,8 +40,11 @@ if (MSVC)
|
||||||
# Use M_PI/M_E macros from math.h
|
# Use M_PI/M_E macros from math.h
|
||||||
add_definitions(-D_USE_MATH_DEFINES -DHAVE_M_PI)
|
add_definitions(-D_USE_MATH_DEFINES -DHAVE_M_PI)
|
||||||
|
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
|
# Disable warning C4506 so that src/lua/LuaObject.h: template <> void LuaObject<SystemPath>::PushToLua(const SystemPath &o);
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
|
# doesn't spew multiple warnings
|
||||||
|
|
||||||
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP /wd4506")
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /wd4506")
|
||||||
endif (MSVC)
|
endif (MSVC)
|
||||||
|
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
|
|
Loading…
Reference in New Issue