aboutsummaryrefslogtreecommitdiff
path: root/sdk/compiler/cmake/linux
diff options
context:
space:
mode:
authorBryan Galdrikian <[email protected]>2017-10-24 15:25:02 -0700
committerBryan Galdrikian <[email protected]>2017-10-24 15:25:02 -0700
commitb0c11962f6012430da3bcaa2727288046b33d648 (patch)
treecf13338fa4fd7072badf64f751f94abeeb437003 /sdk/compiler/cmake/linux
parentlinux build fix - all configs (diff)
downloadblast-b0c11962f6012430da3bcaa2727288046b33d648.tar.xz
blast-b0c11962f6012430da3bcaa2727288046b33d648.zip
Changes for 1.1.1
See README.md
Diffstat (limited to 'sdk/compiler/cmake/linux')
-rw-r--r--sdk/compiler/cmake/linux/NvBlastExtAuthoring.cmake4
-rw-r--r--sdk/compiler/cmake/linux/NvBlastExtShaders.cmake2
2 files changed, 4 insertions, 2 deletions
diff --git a/sdk/compiler/cmake/linux/NvBlastExtAuthoring.cmake b/sdk/compiler/cmake/linux/NvBlastExtAuthoring.cmake
index 3d7bb78..b640582 100644
--- a/sdk/compiler/cmake/linux/NvBlastExtAuthoring.cmake
+++ b/sdk/compiler/cmake/linux/NvBlastExtAuthoring.cmake
@@ -24,6 +24,8 @@ SET(BLAST_EXT_SHARED_LIB_TYPE SHARED)
#This option doesn't work on Clang
IF (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "-Wno-maybe-uninitialized" "-fexceptions" "-Wno-unused-parameter")
+ SET(VHACD_COMPILE_FLAGS "-Wno-type-limits -Wno-ignored-qualifiers -Wno-unused-result")
ELSE ()
SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "-Wno-return-type-c-linkage" "-pedantic" "-fexceptions" "-Wno-unused-parameter")
-ENDIF() \ No newline at end of file
+ SET(VHACD_COMPILE_FLAGS "-Wno-logical-op-parentheses -Wno-ignored-qualifiers")
+ENDIF()
diff --git a/sdk/compiler/cmake/linux/NvBlastExtShaders.cmake b/sdk/compiler/cmake/linux/NvBlastExtShaders.cmake
index a5c8c67..28cc234 100644
--- a/sdk/compiler/cmake/linux/NvBlastExtShaders.cmake
+++ b/sdk/compiler/cmake/linux/NvBlastExtShaders.cmake
@@ -20,4 +20,4 @@ SET(BLASTEXT_COMPILE_DEFS
SET(BLAST_EXT_SHARED_LIB_TYPE SHARED)
-SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "-Wno-unknown-pragmas" "-pedantic")
+SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "-Wno-unknown-pragmas" "-Wno-return-type-c-linkage" "-pedantic")