File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -145,6 +145,13 @@ IF(UNIX)
145145 ENDIF ()
146146ELSE (${UNIX } ) #Windows
147147 ADD_DEFINITIONS (-DOS_WIN -DNOMINMAX )
148+ IF (MSVC )
149+ # MP is multiprocess compilation. Gm- disables minimal rebuilds
150+ # http://stackoverflow.com/questions/6172205/how-can-i-do-a-parallel-build-in-visual-studio-2010vvvvvvvv
151+ # http://www.kitware.com/blog/home/post/434
152+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS } /MP /Gm-" )
153+ SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS } /MP /Gm-" )
154+ ENDIF (MSVC )
148155ENDIF ()
149156
150157# Architechture Definitions
Original file line number Diff line number Diff line change @@ -33,8 +33,8 @@ ENDIF()
3333IF (WIN32 )
3434 # Deprecated Errors are Warning 4996 on VS2013.
3535 # https://msdn.microsoft.com/en-us/library/ttcz0bys.aspx
36- SET (CMAKE_CXX_FLAGS "/we4996" )
37- SET (CMAKE_C_FLAGS "/we4996" )
36+ SET (CMAKE_CXX_FLAGS "${ CMAKE_CXX_FLAGS } /we4996" )
37+ SET (CMAKE_C_FLAGS "${ CMAKE_C_FLAGS } /we4996" )
3838ELSE (WIN32 )
3939 SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS } -Werror=deprecated-declarations" )
4040 SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS } -Werror=deprecated-declarations" )
You can’t perform that action at this time.
0 commit comments