From 7115f60b91b5717d90f643fd692010905c7004db Mon Sep 17 00:00:00 2001 From: Bryan Galdrikian Date: Thu, 31 May 2018 11:36:08 -0700 Subject: Blast 1.1.3. See docs/release_notes.txt. --- sdk/compiler/cmake/linux/CMakeLists.txt | 92 +++++++++++----------- sdk/compiler/cmake/linux/NvBlast.cmake | 46 +++++------ .../cmake/linux/NvBlastExtAssetUtils.cmake | 54 ++++++------- sdk/compiler/cmake/linux/NvBlastExtAuthoring.cmake | 62 +++++++-------- sdk/compiler/cmake/linux/NvBlastExtImport.cmake | 46 +++++------ sdk/compiler/cmake/linux/NvBlastExtPhysX.cmake | 56 ++++++------- .../cmake/linux/NvBlastExtPxSerialization.cmake | 58 +++++++------- .../cmake/linux/NvBlastExtSerialization.cmake | 54 ++++++------- sdk/compiler/cmake/linux/NvBlastExtShaders.cmake | 46 +++++------ sdk/compiler/cmake/linux/NvBlastExtStress.cmake | 22 +++--- .../cmake/linux/NvBlastExtTkSerialization.cmake | 54 ++++++------- sdk/compiler/cmake/linux/NvBlastGlobals.cmake | 28 +++---- sdk/compiler/cmake/linux/NvBlastTk.cmake | 56 ++++++------- 13 files changed, 337 insertions(+), 337 deletions(-) mode change 100644 => 100755 sdk/compiler/cmake/linux/CMakeLists.txt mode change 100644 => 100755 sdk/compiler/cmake/linux/NvBlast.cmake mode change 100644 => 100755 sdk/compiler/cmake/linux/NvBlastExtAssetUtils.cmake mode change 100644 => 100755 sdk/compiler/cmake/linux/NvBlastExtAuthoring.cmake mode change 100644 => 100755 sdk/compiler/cmake/linux/NvBlastExtImport.cmake mode change 100644 => 100755 sdk/compiler/cmake/linux/NvBlastExtPhysX.cmake mode change 100644 => 100755 sdk/compiler/cmake/linux/NvBlastExtPxSerialization.cmake mode change 100644 => 100755 sdk/compiler/cmake/linux/NvBlastExtSerialization.cmake mode change 100644 => 100755 sdk/compiler/cmake/linux/NvBlastExtShaders.cmake mode change 100644 => 100755 sdk/compiler/cmake/linux/NvBlastExtStress.cmake mode change 100644 => 100755 sdk/compiler/cmake/linux/NvBlastExtTkSerialization.cmake mode change 100644 => 100755 sdk/compiler/cmake/linux/NvBlastGlobals.cmake mode change 100644 => 100755 sdk/compiler/cmake/linux/NvBlastTk.cmake (limited to 'sdk/compiler/cmake/linux') diff --git a/sdk/compiler/cmake/linux/CMakeLists.txt b/sdk/compiler/cmake/linux/CMakeLists.txt old mode 100644 new mode 100755 index 1a6497d..b3560aa --- a/sdk/compiler/cmake/linux/CMakeLists.txt +++ b/sdk/compiler/cmake/linux/CMakeLists.txt @@ -1,46 +1,46 @@ -#Platform specific compile flags and project includes - -SET(CMAKE_CXX_FLAGS "-Wextra -Werror -fdiagnostics-show-option -fno-rtti -fno-exceptions -m64 -msse2 -mfpmath=sse -fPIC -ffast-math -fno-exceptions -fno-rtti -Wno-invalid-offsetof -Wno-unknown-pragmas -std=c++0x -Wreorder") - -SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -gdwarf-2") -SET(CMAKE_CXX_FLAGS_CHECKED "-O3 -g3 -gdwarf-2 -fno-strict-aliasing") -SET(CMAKE_CXX_FLAGS_PROFILE "-O3 -fno-strict-aliasing") -SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -fno-strict-aliasing") - -SET(BLAST_SLN_COMPILE_DEFS ) - -SET(BLAST_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;) -SET(BLAST_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;) -SET(BLAST_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;) -SET(BLAST_SLN_RELEASE_COMPILE_DEFS NDEBUG;) - -# Include all of the projects -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlast.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastGlobals.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastTk.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtShaders.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtStress.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtPhysX.cmake) -INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtAuthoring.cmake) - -IF(${UE4_LINUX_CROSSCOMPILE}) - #This uses the Windows CapnProto exe so it works - INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtAssetUtils.cmake) - INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtSerialization.cmake) - INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtTkSerialization.cmake) - INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtPxSerialization.cmake) - - #The UE4 Linux cross tools don't include libc++, it's in the UE4 source, however UE4 uses libc++ - #and not libstdc++ so link this statically to avoid a dependency - SET(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++") - SET(CMAKE_SHARED_LINKER_FLAGS "-static-libgcc -static-libstdc++") -ELSE() - #TODO Update Linux CapnProto build to generate correct version code - - INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtAssetUtils.cmake) - - #INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtImport.cmake) - INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtSerialization.cmake) - INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtTkSerialization.cmake) - INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtPxSerialization.cmake) -ENDIF() +#Platform specific compile flags and project includes + +SET(CMAKE_CXX_FLAGS "-Wextra -Werror -fdiagnostics-show-option -fno-rtti -fno-exceptions -m64 -msse2 -mfpmath=sse -fPIC -ffast-math -fno-exceptions -fno-rtti -Wno-invalid-offsetof -Wno-unknown-pragmas -std=c++0x -Wreorder") + +SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -gdwarf-2") +SET(CMAKE_CXX_FLAGS_CHECKED "-O3 -g3 -gdwarf-2 -fno-strict-aliasing") +SET(CMAKE_CXX_FLAGS_PROFILE "-O3 -fno-strict-aliasing") +SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -fno-strict-aliasing") + +SET(BLAST_SLN_COMPILE_DEFS ) + +SET(BLAST_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;) +SET(BLAST_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;) +SET(BLAST_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;) +SET(BLAST_SLN_RELEASE_COMPILE_DEFS NDEBUG;) + +# Include all of the projects +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlast.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastGlobals.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastTk.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtShaders.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtStress.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtPhysX.cmake) +INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtAuthoring.cmake) + +IF(${UE4_LINUX_CROSSCOMPILE}) + #This uses the Windows CapnProto exe so it works + INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtAssetUtils.cmake) + INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtSerialization.cmake) + INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtTkSerialization.cmake) + INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtPxSerialization.cmake) + + #The UE4 Linux cross tools don't include libc++, it's in the UE4 source, however UE4 uses libc++ + #and not libstdc++ so link this statically to avoid a dependency + SET(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++") + SET(CMAKE_SHARED_LINKER_FLAGS "-static-libgcc -static-libstdc++") +ELSE() + #TODO Update Linux CapnProto build to generate correct version code + + INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtAssetUtils.cmake) + + #INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtImport.cmake) + INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtSerialization.cmake) + INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtTkSerialization.cmake) + INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtPxSerialization.cmake) +ENDIF() diff --git a/sdk/compiler/cmake/linux/NvBlast.cmake b/sdk/compiler/cmake/linux/NvBlast.cmake old mode 100644 new mode 100755 index c1b0363..079dc2d --- a/sdk/compiler/cmake/linux/NvBlast.cmake +++ b/sdk/compiler/cmake/linux/NvBlast.cmake @@ -1,23 +1,23 @@ -# -# Build NvBlast Linux -# - -SET(BLAST_PLATFORM_COMMON_FILES -) - -SET(BLAST_PLATFORM_INCLUDES -) - -SET(BLAST_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS}; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLAST_LIB_TYPE SHARED) - -SET(BLAST_PLATFORM_COMPILE_OPTIONS "-pedantic") +# +# Build NvBlast Linux +# + +SET(BLAST_PLATFORM_COMMON_FILES +) + +SET(BLAST_PLATFORM_INCLUDES +) + +SET(BLAST_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS}; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLAST_LIB_TYPE SHARED) + +SET(BLAST_PLATFORM_COMPILE_OPTIONS "-pedantic") diff --git a/sdk/compiler/cmake/linux/NvBlastExtAssetUtils.cmake b/sdk/compiler/cmake/linux/NvBlastExtAssetUtils.cmake old mode 100644 new mode 100755 index 71ff1aa..fb90ce2 --- a/sdk/compiler/cmake/linux/NvBlastExtAssetUtils.cmake +++ b/sdk/compiler/cmake/linux/NvBlastExtAssetUtils.cmake @@ -1,27 +1,27 @@ -# -# Build NvBlastExtAssetUtils Windows -# - -SET(BLASTEXTASSETUTILS_PLATFORM_COMMON_FILES -# No Linux counterpart -# ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h -) - -SET(BLASTEXTASSETUTILS_PLATFORM_INCLUDES -) - -SET(BLASTEXTASSETUTILS_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLASTEXTASSETUTILS_LIB_TYPE SHARED) - - -SET(BLASTEXTASSETUTILS_COMPILE_OPTIONS "") - +# +# Build NvBlastExtAssetUtils Windows +# + +SET(BLASTEXTASSETUTILS_PLATFORM_COMMON_FILES +# No Linux counterpart +# ${COMMON_SOURCE_DIR}/NvBlastIncludeWindows.h +) + +SET(BLASTEXTASSETUTILS_PLATFORM_INCLUDES +) + +SET(BLASTEXTASSETUTILS_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS};_CONSOLE; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLASTEXTASSETUTILS_LIB_TYPE SHARED) + + +SET(BLASTEXTASSETUTILS_COMPILE_OPTIONS "") + diff --git a/sdk/compiler/cmake/linux/NvBlastExtAuthoring.cmake b/sdk/compiler/cmake/linux/NvBlastExtAuthoring.cmake old mode 100644 new mode 100755 index b640582..2917574 --- a/sdk/compiler/cmake/linux/NvBlastExtAuthoring.cmake +++ b/sdk/compiler/cmake/linux/NvBlastExtAuthoring.cmake @@ -1,31 +1,31 @@ -# -# Build NvBlast Linux -# - -SET(BLASTEXT_PLATFORM_COMMON_FILES -) - -SET(BLASTEXT_PLATFORM_INCLUDES -) - -SET(BLASTEXT_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS}; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLAST_EXT_SHARED_LIB_TYPE SHARED) - -#Exceptions are needed by boost -#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") - SET(VHACD_COMPILE_FLAGS "-Wno-logical-op-parentheses -Wno-ignored-qualifiers") -ENDIF() +# +# Build NvBlast Linux +# + +SET(BLASTEXT_PLATFORM_COMMON_FILES +) + +SET(BLASTEXT_PLATFORM_INCLUDES +) + +SET(BLASTEXT_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS}; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLAST_EXT_SHARED_LIB_TYPE SHARED) + +#Exceptions are needed by boost +#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") + SET(VHACD_COMPILE_FLAGS "-Wno-logical-op-parentheses -Wno-ignored-qualifiers") +ENDIF() diff --git a/sdk/compiler/cmake/linux/NvBlastExtImport.cmake b/sdk/compiler/cmake/linux/NvBlastExtImport.cmake old mode 100644 new mode 100755 index 543887d..33ad364 --- a/sdk/compiler/cmake/linux/NvBlastExtImport.cmake +++ b/sdk/compiler/cmake/linux/NvBlastExtImport.cmake @@ -1,23 +1,23 @@ -# -# Build NvBlast Linux -# - -SET(BLASTEXT_PLATFORM_COMMON_FILES -) - -SET(BLASTEXT_PLATFORM_INCLUDES -) - -SET(BLASTEXT_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS}; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLAST_EXT_SHARED_LIB_TYPE SHARED) - -SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "-Wno-unknown-pragmas") +# +# Build NvBlast Linux +# + +SET(BLASTEXT_PLATFORM_COMMON_FILES +) + +SET(BLASTEXT_PLATFORM_INCLUDES +) + +SET(BLASTEXT_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS}; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLAST_EXT_SHARED_LIB_TYPE SHARED) + +SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "-Wno-unknown-pragmas") diff --git a/sdk/compiler/cmake/linux/NvBlastExtPhysX.cmake b/sdk/compiler/cmake/linux/NvBlastExtPhysX.cmake old mode 100644 new mode 100755 index 9edb58c..9029d26 --- a/sdk/compiler/cmake/linux/NvBlastExtPhysX.cmake +++ b/sdk/compiler/cmake/linux/NvBlastExtPhysX.cmake @@ -1,28 +1,28 @@ -# -# Build NvBlast Linux -# - -SET(BLASTEXT_PLATFORM_COMMON_FILES -) - -SET(BLASTEXT_PLATFORM_INCLUDES -) - -SET(BLASTEXT_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS}; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLASTEXT_PHYSX_LIBTYPE SHARED) - -#-Wno-maybe-uninitialized doesn't work on Clang -IF (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "-Wno-unknown-pragmas" "-Wno-maybe-uninitialized") -ELSE() - SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "-Wno-unknown-pragmas" "-Wno-return-type-c-linkage") -ENDIF() +# +# Build NvBlast Linux +# + +SET(BLASTEXT_PLATFORM_COMMON_FILES +) + +SET(BLASTEXT_PLATFORM_INCLUDES +) + +SET(BLASTEXT_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS}; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLASTEXT_PHYSX_LIBTYPE SHARED) + +#-Wno-maybe-uninitialized doesn't work on Clang +IF (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "-Wno-unknown-pragmas" "-Wno-maybe-uninitialized") +ELSE() + SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "-Wno-unknown-pragmas" "-Wno-return-type-c-linkage") +ENDIF() diff --git a/sdk/compiler/cmake/linux/NvBlastExtPxSerialization.cmake b/sdk/compiler/cmake/linux/NvBlastExtPxSerialization.cmake old mode 100644 new mode 100755 index 8507ea2..a5c5dd9 --- a/sdk/compiler/cmake/linux/NvBlastExtPxSerialization.cmake +++ b/sdk/compiler/cmake/linux/NvBlastExtPxSerialization.cmake @@ -1,29 +1,29 @@ -# -# Build NvBlastExtPxSerialization Linux -# - -SET(BLASTEXTPXSERIALIZATION_PLATFORM_COMMON_FILES -) - -SET(BLASTEXTPXSERIALIZATION_PLATFORM_INCLUDES -) - -SET(BLASTEXTPXSERIALIZATION_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS}; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLASTEXTPXSERIALIZATION_LIB_TYPE SHARED) - -IF (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - SET(BLASTEXTPXSERIALIZATION_COMPILE_OPTIONS "-Wno-sign-compare") -ELSE() - SET(BLASTEXTPXSERIALIZATION_COMPILE_OPTIONS "-Wno-sign-compare" "-Wno-return-type-c-linkage" "-Wno-unused-parameter") -ENDIF() - - +# +# Build NvBlastExtPxSerialization Linux +# + +SET(BLASTEXTPXSERIALIZATION_PLATFORM_COMMON_FILES +) + +SET(BLASTEXTPXSERIALIZATION_PLATFORM_INCLUDES +) + +SET(BLASTEXTPXSERIALIZATION_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS}; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLASTEXTPXSERIALIZATION_LIB_TYPE SHARED) + +IF (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + SET(BLASTEXTPXSERIALIZATION_COMPILE_OPTIONS "-Wno-sign-compare") +ELSE() + SET(BLASTEXTPXSERIALIZATION_COMPILE_OPTIONS "-Wno-sign-compare" "-Wno-return-type-c-linkage" "-Wno-unused-parameter") +ENDIF() + + diff --git a/sdk/compiler/cmake/linux/NvBlastExtSerialization.cmake b/sdk/compiler/cmake/linux/NvBlastExtSerialization.cmake old mode 100644 new mode 100755 index b6d4d84..4f000ef --- a/sdk/compiler/cmake/linux/NvBlastExtSerialization.cmake +++ b/sdk/compiler/cmake/linux/NvBlastExtSerialization.cmake @@ -1,27 +1,27 @@ -# -# Build NvBlastExtSerialization Linux -# - -SET(BLASTEXTSERIALIZATION_PLATFORM_COMMON_FILES -) - -SET(BLASTEXTSERIALIZATION_PLATFORM_INCLUDES -) - -SET(BLASTEXTSERIALIZATION_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS}; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLASTEXTSERIALIZATION_LIB_TYPE SHARED) - -IF (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - SET(BLASTEXTSERIALIZATION_COMPILE_OPTIONS "-Wno-sign-compare") -ELSE() - SET(BLASTEXTSERIALIZATION_COMPILE_OPTIONS "-Wno-sign-compare" "-Wno-unused-parameter" "-Wno-return-type-c-linkage") -ENDIF() +# +# Build NvBlastExtSerialization Linux +# + +SET(BLASTEXTSERIALIZATION_PLATFORM_COMMON_FILES +) + +SET(BLASTEXTSERIALIZATION_PLATFORM_INCLUDES +) + +SET(BLASTEXTSERIALIZATION_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS}; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLASTEXTSERIALIZATION_LIB_TYPE SHARED) + +IF (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + SET(BLASTEXTSERIALIZATION_COMPILE_OPTIONS "-Wno-sign-compare") +ELSE() + SET(BLASTEXTSERIALIZATION_COMPILE_OPTIONS "-Wno-sign-compare" "-Wno-unused-parameter" "-Wno-return-type-c-linkage") +ENDIF() diff --git a/sdk/compiler/cmake/linux/NvBlastExtShaders.cmake b/sdk/compiler/cmake/linux/NvBlastExtShaders.cmake old mode 100644 new mode 100755 index 28cc234..db71732 --- a/sdk/compiler/cmake/linux/NvBlastExtShaders.cmake +++ b/sdk/compiler/cmake/linux/NvBlastExtShaders.cmake @@ -1,23 +1,23 @@ -# -# Build NvBlast Linux -# - -SET(BLASTEXT_PLATFORM_COMMON_FILES -) - -SET(BLASTEXT_PLATFORM_INCLUDES -) - -SET(BLASTEXT_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS}; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLAST_EXT_SHARED_LIB_TYPE SHARED) - -SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "-Wno-unknown-pragmas" "-Wno-return-type-c-linkage" "-pedantic") +# +# Build NvBlast Linux +# + +SET(BLASTEXT_PLATFORM_COMMON_FILES +) + +SET(BLASTEXT_PLATFORM_INCLUDES +) + +SET(BLASTEXT_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS}; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLAST_EXT_SHARED_LIB_TYPE SHARED) + +SET(BLASTEXT_PLATFORM_COMPILE_OPTIONS "-Wno-unknown-pragmas" "-Wno-return-type-c-linkage" "-pedantic") diff --git a/sdk/compiler/cmake/linux/NvBlastExtStress.cmake b/sdk/compiler/cmake/linux/NvBlastExtStress.cmake old mode 100644 new mode 100755 index 96fe6a0..f07c509 --- a/sdk/compiler/cmake/linux/NvBlastExtStress.cmake +++ b/sdk/compiler/cmake/linux/NvBlastExtStress.cmake @@ -1,11 +1,11 @@ -# -# Build NvBlast Linux -# - -SET(BLASTTK_LIBTYPE SHARED) - -IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - SET(BLASTEXTSTRESS_PLATFORM_COMPILE_OPTIONS "-Wno-return-type-c-linkage" "-pedantic") -ELSE() - SET(BLASTEXTSTRESS_PLATFORM_COMPILE_OPTIONS "-pedantic") -ENDIF() +# +# Build NvBlast Linux +# + +SET(BLASTTK_LIBTYPE SHARED) + +IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + SET(BLASTEXTSTRESS_PLATFORM_COMPILE_OPTIONS "-Wno-return-type-c-linkage" "-pedantic") +ELSE() + SET(BLASTEXTSTRESS_PLATFORM_COMPILE_OPTIONS "-pedantic") +ENDIF() diff --git a/sdk/compiler/cmake/linux/NvBlastExtTkSerialization.cmake b/sdk/compiler/cmake/linux/NvBlastExtTkSerialization.cmake old mode 100644 new mode 100755 index 12ade81..8ef4c19 --- a/sdk/compiler/cmake/linux/NvBlastExtTkSerialization.cmake +++ b/sdk/compiler/cmake/linux/NvBlastExtTkSerialization.cmake @@ -1,27 +1,27 @@ -# -# Build NvBlastExtTkSerialization Linux -# - -SET(BLASTEXTTKSERIALIZATION_PLATFORM_COMMON_FILES -) - -SET(BLASTEXTTKSERIALIZATION_PLATFORM_INCLUDES -) - -SET(BLASTEXTTKSERIALIZATION_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS}; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLASTEXTTKSERIALIZATION_LIB_TYPE SHARED) - -IF (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - SET(BLASTEXTTKSERIALIZATION_COMPILE_OPTIONS "-Wno-sign-compare") -ELSE() - SET(BLASTEXTTKSERIALIZATION_COMPILE_OPTIONS "-Wno-sign-compare" "-Wno-return-type-c-linkage" "-Wno-unused-parameter") -ENDIF() +# +# Build NvBlastExtTkSerialization Linux +# + +SET(BLASTEXTTKSERIALIZATION_PLATFORM_COMMON_FILES +) + +SET(BLASTEXTTKSERIALIZATION_PLATFORM_INCLUDES +) + +SET(BLASTEXTTKSERIALIZATION_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS}; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLASTEXTTKSERIALIZATION_LIB_TYPE SHARED) + +IF (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + SET(BLASTEXTTKSERIALIZATION_COMPILE_OPTIONS "-Wno-sign-compare") +ELSE() + SET(BLASTEXTTKSERIALIZATION_COMPILE_OPTIONS "-Wno-sign-compare" "-Wno-return-type-c-linkage" "-Wno-unused-parameter") +ENDIF() diff --git a/sdk/compiler/cmake/linux/NvBlastGlobals.cmake b/sdk/compiler/cmake/linux/NvBlastGlobals.cmake old mode 100644 new mode 100755 index 163d4b9..dd000be --- a/sdk/compiler/cmake/linux/NvBlastGlobals.cmake +++ b/sdk/compiler/cmake/linux/NvBlastGlobals.cmake @@ -1,15 +1,15 @@ -# -# Build NvBlastGlobals Linux -# - -SET(BLASTGLOBALS_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS}; - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - +# +# Build NvBlastGlobals Linux +# + +SET(BLASTGLOBALS_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS}; + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + SET(BLASTGLOBALS_PLATFORM_COMPILE_OPTIONS "-pedantic") \ No newline at end of file diff --git a/sdk/compiler/cmake/linux/NvBlastTk.cmake b/sdk/compiler/cmake/linux/NvBlastTk.cmake old mode 100644 new mode 100755 index 5ea3746..6c79d4c --- a/sdk/compiler/cmake/linux/NvBlastTk.cmake +++ b/sdk/compiler/cmake/linux/NvBlastTk.cmake @@ -1,28 +1,28 @@ -# -# Build NvBlastTk Linux -# - -SET(BLASTTK_PLATFORM_COMMON_FILES -) - -SET(BLASTTK_PLATFORM_INCLUDES -) - -SET(BLASTTK_COMPILE_DEFS - # Common to all configurations - ${BLAST_SLN_COMPILE_DEFS} - - $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> - $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> - $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> - $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> -) - -SET(BLASTTK_LIBTYPE SHARED) - -IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - SET(BLASTTK_PLATFORM_COMPILE_OPTIONS "-Wno-return-type-c-linkage" "-pedantic") -ELSE () - SET(BLASTTK_PLATFORM_COMPILE_OPTIONS "-pedantic") -ENDIF() - +# +# Build NvBlastTk Linux +# + +SET(BLASTTK_PLATFORM_COMMON_FILES +) + +SET(BLASTTK_PLATFORM_INCLUDES +) + +SET(BLASTTK_COMPILE_DEFS + # Common to all configurations + ${BLAST_SLN_COMPILE_DEFS} + + $<$:${BLAST_SLN_DEBUG_COMPILE_DEFS}> + $<$:${BLAST_SLN_CHECKED_COMPILE_DEFS}> + $<$:${BLAST_SLN_PROFILE_COMPILE_DEFS}> + $<$:${BLAST_SLN_RELEASE_COMPILE_DEFS}> +) + +SET(BLASTTK_LIBTYPE SHARED) + +IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + SET(BLASTTK_PLATFORM_COMPILE_OPTIONS "-Wno-return-type-c-linkage" "-pedantic") +ELSE () + SET(BLASTTK_PLATFORM_COMPILE_OPTIONS "-pedantic") +ENDIF() + -- cgit v1.2.3