AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-24 04:20:21 +00:00
Code Issues Releases Wiki Activity

Merge pull request #817 from davidgyu/dev-iso646-fix

Browse Source 
iso-646 fix remove obsolete compiler defines
This commit is contained in:
George ElKoura 2016-07-07 22:21:08 -07:00 committed by GitHub
commit 9bd1c7e0d9
1 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
CMakeLists.txt
View File

@ -207,42 +207,6 @@ elseif(MSVC)
# Turn on all warnings # Turn on all warnings
list(APPEND OSD_COMPILER_FLAGS /Wall) list(APPEND OSD_COMPILER_FLAGS /Wall)
# Temporary option to assist in the refactoring to avoid the need for these.
# https://github.com/PixarAnimationStudios/OpenSubdiv/issues/779#
option(NO_ISO646 "Disable MSVC iso646.h macros" OFF)
if(NOT NO_ISO646)
# MSVC is unfortunately not standard conforming with regards to
# the alternative names for logical and bitwise operators:
# http://stackoverflow.com/questions/555505/c-alternative-tokens
# http://stackoverflow.com/questions/6006526/c-writing-or-instead-of
#
# This can be solved by including iso646.h, but that is a rather
# unsatisfactory solution since we then always have to remember to
# include this header file. Instead we define these operators
# ourselves as command line arguments to cl.exe.
#
# An alternative would be to compile with the /Za option
# (but unfortunately that breaks other code):
# http://msdn.microsoft.com/en-us/library/0k0w269d.aspx
list(APPEND OSD_COMPILER_FLAGS
/Dand=&&
/Dand_eq=&=
/Dbitand=&
/Dbitor=|
/Dcompl=~
/Dnot=!
/Dnot_eq=!=
/Dor=||
/Dor_eq=|=
# nvcc does not seem to like a caret being the last character
# in a command line defined preprocessor symbol, so add an
# empty trailing comment to avoid this.
/Dxor=^/**/
/Dxor_eq=^=
)
endif()
list(APPEND OSD_COMPILER_FLAGS list(APPEND OSD_COMPILER_FLAGS
/W3 # Use warning level recommended for production purposes. /W3 # Use warning level recommended for production purposes.
/WX # Treat all compiler warnings as errors. /WX # Treat all compiler warnings as errors.