aboutsummaryrefslogtreecommitdiff
path: root/test/compiler/cmake/windows
diff options
context:
space:
mode:
authorBryan Galdrikian <[email protected]>2018-05-31 11:36:08 -0700
committerBryan Galdrikian <[email protected]>2018-05-31 11:36:08 -0700
commit7115f60b91b5717d90f643fd692010905c7004db (patch)
treeeffd68c6978751c517d54c2f2bb5bb6e7dc93e18 /test/compiler/cmake/windows
parentUpdating BlastTool zip (diff)
downloadblast-1.1.3_rc1.tar.xz
blast-1.1.3_rc1.zip
Blast 1.1.3. See docs/release_notes.txt.v1.1.3_rc1
Diffstat (limited to 'test/compiler/cmake/windows')
-rwxr-xr-x[-rw-r--r--]test/compiler/cmake/windows/BlastPerfTests-AT.cmake14
-rwxr-xr-x[-rw-r--r--]test/compiler/cmake/windows/BlastPerfTests.cmake56
-rwxr-xr-x[-rw-r--r--]test/compiler/cmake/windows/BlastUnitTests-AT.cmake18
-rwxr-xr-x[-rw-r--r--]test/compiler/cmake/windows/BlastUnitTests.cmake74
-rwxr-xr-x[-rw-r--r--]test/compiler/cmake/windows/CMakeLists.txt104
5 files changed, 133 insertions, 133 deletions
diff --git a/test/compiler/cmake/windows/BlastPerfTests-AT.cmake b/test/compiler/cmake/windows/BlastPerfTests-AT.cmake
index d1f39d6..b49ed0d 100644..100755
--- a/test/compiler/cmake/windows/BlastPerfTests-AT.cmake
+++ b/test/compiler/cmake/windows/BlastPerfTests-AT.cmake
@@ -1,7 +1,7 @@
-# Copy the dlls from the deps
-
-ADD_CUSTOM_COMMAND(TARGET BlastPerfTests POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
- ${PXSHAREDSDK_DLLS}
- ${BL_EXE_OUTPUT_DIR}
-)
+# Copy the dlls from the deps
+
+ADD_CUSTOM_COMMAND(TARGET BlastPerfTests POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${PXSHAREDSDK_DLLS}
+ ${BL_EXE_OUTPUT_DIR}
+)
diff --git a/test/compiler/cmake/windows/BlastPerfTests.cmake b/test/compiler/cmake/windows/BlastPerfTests.cmake
index 0ef6083..5e21498 100644..100755
--- a/test/compiler/cmake/windows/BlastPerfTests.cmake
+++ b/test/compiler/cmake/windows/BlastPerfTests.cmake
@@ -1,28 +1,28 @@
-#
-# Build BlastPerfTests Windows
-#
-
-FIND_PACKAGE(nvToolsExt $ENV{PM_nvToolsExt_VERSION} REQUIRED)
-
-SET(BLASTPERFTESTS_PLATFORM_COMMON_FILES
-)
-
-SET(BLASTPERFTESTS_PLATFORM_INCLUDES
- PRIVATE $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_INCLUDE_DIRS}>
-)
-
-SET(BLASTPERFTESTS_COMPILE_DEFS
- # Common to all configurations
- ${BLASTTESTS_SLN_COMPILE_DEFS}
-
- $<$<CONFIG:debug>:${BLASTTESTS_SLN_DEBUG_COMPILE_DEFS}>
- $<$<CONFIG:checked>:${BLASTTESTS_SLN_CHECKED_COMPILE_DEFS}>
- $<$<CONFIG:profile>:${BLASTTESTS_SLN_PROFILE_COMPILE_DEFS}>
- $<$<CONFIG:release>:${BLASTTESTS_SLN_RELEASE_COMPILE_DEFS}>
-)
-
-SET(BLASTPERFTESTS_PLATFORM_LINKED_LIBS
- $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_LIB}>
-)
-
-
+#
+# Build BlastPerfTests Windows
+#
+
+FIND_PACKAGE(nvToolsExt $ENV{PM_nvToolsExt_VERSION} REQUIRED)
+
+SET(BLASTPERFTESTS_PLATFORM_COMMON_FILES
+)
+
+SET(BLASTPERFTESTS_PLATFORM_INCLUDES
+ PRIVATE $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_INCLUDE_DIRS}>
+)
+
+SET(BLASTPERFTESTS_COMPILE_DEFS
+ # Common to all configurations
+ ${BLASTTESTS_SLN_COMPILE_DEFS}
+
+ $<$<CONFIG:debug>:${BLASTTESTS_SLN_DEBUG_COMPILE_DEFS}>
+ $<$<CONFIG:checked>:${BLASTTESTS_SLN_CHECKED_COMPILE_DEFS}>
+ $<$<CONFIG:profile>:${BLASTTESTS_SLN_PROFILE_COMPILE_DEFS}>
+ $<$<CONFIG:release>:${BLASTTESTS_SLN_RELEASE_COMPILE_DEFS}>
+)
+
+SET(BLASTPERFTESTS_PLATFORM_LINKED_LIBS
+ $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_LIB}>
+)
+
+
diff --git a/test/compiler/cmake/windows/BlastUnitTests-AT.cmake b/test/compiler/cmake/windows/BlastUnitTests-AT.cmake
index 6b47219..b2e89a9 100644..100755
--- a/test/compiler/cmake/windows/BlastUnitTests-AT.cmake
+++ b/test/compiler/cmake/windows/BlastUnitTests-AT.cmake
@@ -1,9 +1,9 @@
-# Copy the dlls from the deps
-
-ADD_CUSTOM_COMMAND(TARGET BlastUnitTests POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
- ${PXSHAREDSDK_DLLS}
- ${PHYSXSDK_DLLS}
- ${NVTOOLSEXT_DLL}
- $<TARGET_FILE_DIR:BlastUnitTests>
- )
+# Copy the dlls from the deps
+
+ADD_CUSTOM_COMMAND(TARGET BlastUnitTests POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${PXSHAREDSDK_DLLS}
+ ${PHYSXSDK_DLLS}
+ ${NVTOOLSEXT_DLL}
+ $<TARGET_FILE_DIR:BlastUnitTests>
+ )
diff --git a/test/compiler/cmake/windows/BlastUnitTests.cmake b/test/compiler/cmake/windows/BlastUnitTests.cmake
index 1d20411..7a03731 100644..100755
--- a/test/compiler/cmake/windows/BlastUnitTests.cmake
+++ b/test/compiler/cmake/windows/BlastUnitTests.cmake
@@ -1,37 +1,37 @@
-#
-# Build BlastUnitTests Windows
-#
-
-FIND_PACKAGE(nvToolsExt $ENV{PM_nvToolsExt_VERSION} REQUIRED)
-
-SET(BLASTUNITTESTS_PLATFORM_COMMON_FILES
-)
-
-SET(BLASTUNITTESTS_PLATFORM_INCLUDES
- PRIVATE $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_INCLUDE_DIRS}>
-)
-
-SET(BLASTUNITTESTS_COMPILE_DEFS
- # Common to all configurations
- ${BLASTTESTS_SLN_COMPILE_DEFS}
-
- $<$<CONFIG:debug>:${BLASTTESTS_SLN_DEBUG_COMPILE_DEFS}>
- $<$<CONFIG:checked>:${BLASTTESTS_SLN_CHECKED_COMPILE_DEFS}>
- $<$<CONFIG:profile>:${BLASTTESTS_SLN_PROFILE_COMPILE_DEFS}>
- $<$<CONFIG:release>:${BLASTTESTS_SLN_RELEASE_COMPILE_DEFS}>
-)
-
-
-if(SERIALIZATION_INCLUDED)
- MESSAGE("Serialization included")
- SET(BLASTUNITTESTS_PLATFORM_LINKED_LIBS
- NvBlastExtSerialization
- $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_LIB}>
- )
-else()
- MESSAGE("Serialization NOT NOT NOT included")
- SET(BLASTUNITTESTS_PLATFORM_LINKED_LIBS
- $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_LIB}>
- )
-endif()
-
+#
+# Build BlastUnitTests Windows
+#
+
+FIND_PACKAGE(nvToolsExt $ENV{PM_nvToolsExt_VERSION} REQUIRED)
+
+SET(BLASTUNITTESTS_PLATFORM_COMMON_FILES
+)
+
+SET(BLASTUNITTESTS_PLATFORM_INCLUDES
+ PRIVATE $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_INCLUDE_DIRS}>
+)
+
+SET(BLASTUNITTESTS_COMPILE_DEFS
+ # Common to all configurations
+ ${BLASTTESTS_SLN_COMPILE_DEFS}
+
+ $<$<CONFIG:debug>:${BLASTTESTS_SLN_DEBUG_COMPILE_DEFS}>
+ $<$<CONFIG:checked>:${BLASTTESTS_SLN_CHECKED_COMPILE_DEFS}>
+ $<$<CONFIG:profile>:${BLASTTESTS_SLN_PROFILE_COMPILE_DEFS}>
+ $<$<CONFIG:release>:${BLASTTESTS_SLN_RELEASE_COMPILE_DEFS}>
+)
+
+
+if(SERIALIZATION_INCLUDED)
+ MESSAGE("Serialization included")
+ SET(BLASTUNITTESTS_PLATFORM_LINKED_LIBS
+ NvBlastExtSerialization
+ $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_LIB}>
+ )
+else()
+ MESSAGE("Serialization NOT NOT NOT included")
+ SET(BLASTUNITTESTS_PLATFORM_LINKED_LIBS
+ $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_LIB}>
+ )
+endif()
+
diff --git a/test/compiler/cmake/windows/CMakeLists.txt b/test/compiler/cmake/windows/CMakeLists.txt
index 0fcef3e..814d8ec 100644..100755
--- a/test/compiler/cmake/windows/CMakeLists.txt
+++ b/test/compiler/cmake/windows/CMakeLists.txt
@@ -1,52 +1,52 @@
-#Platform specific compile flags and project includes
-
-#NOTE: Warnings lowered on the sample projects as it's got a lot of warnings. Defines below hide more.
-SET(CMAKE_CXX_FLAGS "/GR- /GF /MP /Gy /EHsc /d2Zi+ /errorReport:prompt /fp:fast /Gd /Gm- /GS- /nologo /W3 /WX /Zc:forScope /Zc:inline /Zc:wchar_t /Zi")
-
-# Are we using the static or dynamic RT library? Whatever we use, it needs to be the same in any dependencies
-# we pull in or we're potentially having mismatch issues.
-IF(STATIC_WINCRT)
- SET(WINCRT_NDEBUG "/MT")
- SET(WINCRT_DEBUG "/MTd")
-ELSE()
- SET(WINCRT_NDEBUG "/MD")
- SET(WINCRT_DEBUG "/MDd")
-ENDIF()
-
-SET(CMAKE_CXX_FLAGS_DEBUG "/Od /RTCsu ${WINCRT_DEBUG}")
-SET(CMAKE_CXX_FLAGS_CHECKED "/Ox ${WINCRT_NDEBUG}")
-SET(CMAKE_CXX_FLAGS_PROFILE "/Ox ${WINCRT_NDEBUG}")
-SET(CMAKE_CXX_FLAGS_RELEASE "/Ox ${WINCRT_NDEBUG}")
-
-# Build PDBs for all configurations
-SET(CMAKE_SHARED_LINKER_FLAGS "/DEBUG")
-
-IF(CMAKE_CL_64)
- ADD_DEFINITIONS(-DWIN64)
-ENDIF(CMAKE_CL_64)
-
-
-SET(BLASTTESTS_SLN_COMPILE_DEFS WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;)
-
-SET(BLASTTESTS_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;NV_NVTX=1;)
-SET(BLASTTESTS_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;NV_NVTX=1;)
-SET(BLASTTESTS_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;NV_NVTX=1;)
-SET(BLASTTESTS_SLN_RELEASE_COMPILE_DEFS NDEBUG;)
-
-IF(CMAKE_CL_64)
- SET(LIBPATH_SUFFIX "x64")
-ELSE(CMAKE_CL_64)
- SET(LIBPATH_SUFFIX "x86")
-ENDIF(CMAKE_CL_64)
-
-SET(CMAKE_DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}_${LIBPATH_SUFFIX}")
-SET(CMAKE_PROFILE_POSTFIX "${CMAKE_PROFILE_POSTFIX}_${LIBPATH_SUFFIX}")
-SET(CMAKE_CHECKED_POSTFIX "${CMAKE_CHECKED_POSTFIX}_${LIBPATH_SUFFIX}")
-SET(CMAKE_RELEASE_POSTFIX "${CMAKE_RELEASE_POSTFIX}_${LIBPATH_SUFFIX}")
-
-
-# Include all of the projects
-INCLUDE(${PROJECT_CMAKE_FILES_DIR}/BlastUnitTests.cmake)
-INCLUDE(${PROJECT_CMAKE_FILES_DIR}/BlastPerfTests.cmake)
-
-
+#Platform specific compile flags and project includes
+
+#NOTE: Warnings lowered on the sample projects as it's got a lot of warnings. Defines below hide more.
+SET(CMAKE_CXX_FLAGS "/GR- /GF /MP /Gy /EHsc /d2Zi+ /errorReport:prompt /fp:fast /Gd /Gm- /GS- /nologo /W3 /WX /Zc:forScope /Zc:inline /Zc:wchar_t /Zi /D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING")
+
+# Are we using the static or dynamic RT library? Whatever we use, it needs to be the same in any dependencies
+# we pull in or we're potentially having mismatch issues.
+IF(STATIC_WINCRT)
+ SET(WINCRT_NDEBUG "/MT")
+ SET(WINCRT_DEBUG "/MTd")
+ELSE()
+ SET(WINCRT_NDEBUG "/MD")
+ SET(WINCRT_DEBUG "/MDd")
+ENDIF()
+
+SET(CMAKE_CXX_FLAGS_DEBUG "/Od /RTCsu ${WINCRT_DEBUG}")
+SET(CMAKE_CXX_FLAGS_CHECKED "/Ox ${WINCRT_NDEBUG}")
+SET(CMAKE_CXX_FLAGS_PROFILE "/Ox ${WINCRT_NDEBUG}")
+SET(CMAKE_CXX_FLAGS_RELEASE "/Ox ${WINCRT_NDEBUG}")
+
+# Build PDBs for all configurations
+SET(CMAKE_SHARED_LINKER_FLAGS "/DEBUG")
+
+IF(CMAKE_CL_64)
+ ADD_DEFINITIONS(-DWIN64)
+ENDIF(CMAKE_CL_64)
+
+
+SET(BLASTTESTS_SLN_COMPILE_DEFS WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;)
+
+SET(BLASTTESTS_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;NV_NVTX=1;)
+SET(BLASTTESTS_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;NV_NVTX=1;)
+SET(BLASTTESTS_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;NV_NVTX=1;)
+SET(BLASTTESTS_SLN_RELEASE_COMPILE_DEFS NDEBUG;)
+
+IF(CMAKE_CL_64)
+ SET(LIBPATH_SUFFIX "x64")
+ELSE(CMAKE_CL_64)
+ SET(LIBPATH_SUFFIX "x86")
+ENDIF(CMAKE_CL_64)
+
+SET(CMAKE_DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}_${LIBPATH_SUFFIX}")
+SET(CMAKE_PROFILE_POSTFIX "${CMAKE_PROFILE_POSTFIX}_${LIBPATH_SUFFIX}")
+SET(CMAKE_CHECKED_POSTFIX "${CMAKE_CHECKED_POSTFIX}_${LIBPATH_SUFFIX}")
+SET(CMAKE_RELEASE_POSTFIX "${CMAKE_RELEASE_POSTFIX}_${LIBPATH_SUFFIX}")
+
+
+# Include all of the projects
+INCLUDE(${PROJECT_CMAKE_FILES_DIR}/BlastUnitTests.cmake)
+INCLUDE(${PROJECT_CMAKE_FILES_DIR}/BlastPerfTests.cmake)
+
+