|
@@ -123,7 +123,7 @@ endmacro()
|
|
|
# this applies cached definitions onto the target
|
|
|
macro(_process_defs)
|
|
|
if(DEFINED ${PROJECT_NAME}_defs_)
|
|
|
- set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "${${PROJECT_NAME}_defs_}")
|
|
|
+ set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS ${${PROJECT_NAME}_defs_})
|
|
|
#message(STATUS "applying defs to project ${PROJECT_NAME}: ${${PROJECT_NAME}_defs_}")
|
|
|
endif()
|
|
|
endmacro()
|
|
@@ -343,9 +343,9 @@ if(WIN32)
|
|
|
set(TORQUE_CXX_FLAGS_LIBS "/W0" CACHE TYPE STRING)
|
|
|
mark_as_advanced(TORQUE_CXX_FLAGS_LIBS)
|
|
|
|
|
|
- set(TORQUE_CXX_FLAGS_COMMON_DEFAULT "-DUNICODE -D_UNICODE /MP /O2 /Ob2 /Oi /Ot /Oy /GT /Zi /W4 /nologo /GF /EHsc /GS- /Gy- /Qpar- /fp:fast /fp:except- /GR /Zc:wchar_t- /D_CRT_SECURE_NO_WARNINGS" )
|
|
|
+ set(TORQUE_CXX_FLAGS_COMMON_DEFAULT "-DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS /MP /O2 /Ob2 /Oi /Ot /Oy /GT /Zi /W4 /nologo /GF /EHsc /GS- /Gy- /Qpar- /fp:fast /fp:except- /GR /Zc:wchar_t-" )
|
|
|
if( TORQUE_CPU_X32 )
|
|
|
- set(TORQUE_CXX_FLAGS_COMMON_DEFAULT ${TORQUE_CXX_FLAGS_COMMON_DEFAULT}" /arch:SSE2")
|
|
|
+ set(TORQUE_CXX_FLAGS_COMMON_DEFAULT "${TORQUE_CXX_FLAGS_COMMON_DEFAULT} /arch:SSE2")
|
|
|
endif()
|
|
|
set(TORQUE_CXX_FLAGS_COMMON ${TORQUE_CXX_FLAGS_COMMON_DEFAULT} CACHE TYPE STRING)
|
|
|
|