summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Pfeiffer <cpfeiffer@live.de>2017-10-24 14:48:33 (GMT)
committerBrad King <brad.king@kitware.com>2017-10-24 14:55:06 (GMT)
commit15da0ba3a2a9e637f5de69b4ea49c55916a2dedb (patch)
tree62453d68eda0bfb3c2589c4b67dc037179158195
parenta91eb5e41f486628910f189bf40403568af013c7 (diff)
downloadCMake-15da0ba3a2a9e637f5de69b4ea49c55916a2dedb.zip
CMake-15da0ba3a2a9e637f5de69b4ea49c55916a2dedb.tar.gz
CMake-15da0ba3a2a9e637f5de69b4ea49c55916a2dedb.tar.bz2
Find{OpenMP,OpenACC}: Fix detection with -Werror=return-type
Explicitly return a value from `main` in our test sources. Fixes: #17391
-rw-r--r--Modules/FindOpenACC.cmake9
-rw-r--r--Modules/FindOpenMP.cmake5
2 files changed, 11 insertions, 3 deletions
diff --git a/Modules/FindOpenACC.cmake b/Modules/FindOpenACC.cmake
index 775cc18..dc8321d 100644
--- a/Modules/FindOpenACC.cmake
+++ b/Modules/FindOpenACC.cmake
@@ -49,7 +49,9 @@ be returned with OpenACC_<lang>_FLAGS.
set(OpenACC_C_CXX_TEST_SOURCE
"
int main(){
-#ifndef _OPENACC
+#ifdef _OPENACC
+ return 0;
+#else
breaks_on_purpose
#endif
}
@@ -58,7 +60,9 @@ int main(){
set(OpenACC_Fortran_TEST_SOURCE
"
program test
-#ifndef _OPENACC
+#ifdef _OPENACC
+ return 0;
+#else
breaks_on_purpose
#endif
endprogram test
@@ -79,6 +83,7 @@ const char accver_str[] = { 'I', 'N', 'F', 'O', ':', 'O', 'p', 'e', 'n', 'A',
int main()
{
puts(accver_str);
+ return 0;
}
")
set(OpenACC_Fortran_CHECK_VERSION_SOURCE
diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake
index 272f4dc..5535b9d 100644
--- a/Modules/FindOpenMP.cmake
+++ b/Modules/FindOpenMP.cmake
@@ -123,7 +123,9 @@ set(OpenMP_C_CXX_TEST_SOURCE
"
#include <omp.h>
int main() {
-#ifndef _OPENMP
+#ifdef _OPENMP
+ return 0;
+#else
breaks_on_purpose
#endif
}
@@ -248,6 +250,7 @@ const char ompver_str[] = { 'I', 'N', 'F', 'O', ':', 'O', 'p', 'e', 'n', 'M',
int main()
{
puts(ompver_str);
+ return 0;
}
")