diff options
| author | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
|---|---|---|
| committer | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
| commit | c828f3634723996e6031fb2e3c3d1ac3f4de0cad (patch) | |
| tree | b3fe00a043d5b9351868a0d1f8aead41bb52d2be /ports/cpp-taskflow/fix-compiler-error.patch | |
| parent | 6635a2fa596ca457565eebc2a45664309cd24d77 (diff) | |
| parent | f3f329a048eaff759c1992c458f2e12351486bc7 (diff) | |
| download | vcpkg-update-geos-381.tar.gz vcpkg-update-geos-381.zip | |
Merge remote-tracking branch 'origin/master' into HEADupdate-geos-381
Diffstat (limited to 'ports/cpp-taskflow/fix-compiler-error.patch')
| -rw-r--r-- | ports/cpp-taskflow/fix-compiler-error.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/ports/cpp-taskflow/fix-compiler-error.patch b/ports/cpp-taskflow/fix-compiler-error.patch new file mode 100644 index 000000000..1bcdcd41f --- /dev/null +++ b/ports/cpp-taskflow/fix-compiler-error.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9beec931..6782f1d5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -89,7 +89,7 @@ target_compile_options( + $<$<CXX_COMPILER_ID:AppleClang>:-Wall -Wextra -Wfatal-errors> + $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:Clang>>:-Wall -Wextra -Wfatal-errors> + $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:GNU>>:-Wall -Wextra -Wfatal-errors> +- $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/W3 /permissive-> ++ $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/bigobj /W3 /permissive-> + #$<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=-Wall,-Wextra,-Wfatal-errors> + #$<$<CXX_COMPILER_ID:Clang>:-Wall -Wextra -Wfatal-errors> + #$<$<CXX_COMPILER_ID:GNU>:-Wall -Wextra -Wfatal-errors> +@@ -219,6 +219,8 @@ target_include_directories(${PROJECT_NAME} INTERFACE + # Example program + # ----------------------------------------------------------------------------- + ++if(BUILD_TEST) ++ + message(STATUS "Building examples ...") + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR}) + +@@ -617,6 +619,8 @@ add_test(cuda_kmeans.1000.16C16G ${TF_UTEST_CUDA_KMEANS} -tc=kmeans.1000.16C16G) + + endif(CMAKE_CUDA_COMPILER) + ++endif() ++ + # ----------------------------------------------------------------------------- + # Benchmarking (enabled by TF_BUILD_BENCHMARKS) + # ----------------------------------------------------------------------------- |