diff options
| -rw-r--r-- | Modules/CPack.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindCUDA/select_compute_arch.cmake | 4 | ||||
| -rw-r--r-- | Modules/FindJava.cmake | 5 | ||||
| -rw-r--r-- | Modules/FindOpenMP.cmake | 2 | ||||
| -rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index 6234b9d..d0cfc2b 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -79,7 +79,7 @@ one may call ``cmake --build . --target package`` or ``make package`` or If CMake is run with the Makefile or Ninja generator, then ``include(CPack)`` also generates a target ``package_source``. To build a source package, -instead of ``cpack -G TGZ --config CPackConfig.cmake`` one may call +instead of ``cpack -G TGZ --config CPackSourceConfig.cmake`` one may call ``cmake --build . --target package_source``, ``make package_source``, or ``ninja package_source``. diff --git a/Modules/FindCUDA/select_compute_arch.cmake b/Modules/FindCUDA/select_compute_arch.cmake index c437bb1..c11725d 100644 --- a/Modules/FindCUDA/select_compute_arch.cmake +++ b/Modules/FindCUDA/select_compute_arch.cmake @@ -60,7 +60,7 @@ if(CUDA_VERSION VERSION_GREATER_EQUAL "8.0") list(APPEND CUDA_ALL_GPU_ARCHITECTURES "6.0" "6.1" "6.2") if(CUDA_VERSION VERSION_LESS "9.0") - list(APPEND CUDA_COMMON_GPU_ARCHITECTURES "6.1+PTX") + list(APPEND CUDA_COMMON_GPU_ARCHITECTURES "6.2+PTX") set(CUDA_LIMIT_GPU_ARCHITECTURE "7.0") endif() endif () @@ -71,7 +71,7 @@ if(CUDA_VERSION VERSION_GREATER_EQUAL "9.0") list(APPEND CUDA_ALL_GPU_ARCHITECTURES "7.0" "7.2") if(CUDA_VERSION VERSION_LESS "10.0") - list(APPEND CUDA_COMMON_GPU_ARCHITECTURES "7.0+PTX") + list(APPEND CUDA_COMMON_GPU_ARCHITECTURES "7.2+PTX") set(CUDA_LIMIT_GPU_ARCHITECTURE "8.0") endif() endif() diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index 945df3c..9db740b 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -160,9 +160,8 @@ if(Java_JAVA_EXECUTABLE) OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE) if( res ) - if(var MATCHES "No Java runtime present, requesting install") - set_property(CACHE Java_JAVA_EXECUTABLE - PROPERTY VALUE "Java_JAVA_EXECUTABLE-NOTFOUND") + if(var MATCHES "Unable to locate a Java Runtime to invoke|No Java runtime present, requesting install") + set(Java_JAVA_EXECUTABLE Java_JAVA_EXECUTABLE-NOTFOUND) elseif(${Java_FIND_REQUIRED}) message( FATAL_ERROR "Error executing java -version" ) else() diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake index a4b1e1e..bb38e28 100644 --- a/Modules/FindOpenMP.cmake +++ b/Modules/FindOpenMP.cmake @@ -509,8 +509,8 @@ foreach(LANG IN LISTS OpenMP_FINDLIST) _OPENMP_GET_SPEC_DATE("${LANG}" OpenMP_${LANG}_SPEC_DATE_INTERNAL) set(OpenMP_${LANG}_SPEC_DATE "${OpenMP_${LANG}_SPEC_DATE_INTERNAL}" CACHE INTERNAL "${LANG} compiler's OpenMP specification date") - _OPENMP_SET_VERSION_BY_SPEC_DATE("${LANG}") endif() + _OPENMP_SET_VERSION_BY_SPEC_DATE("${LANG}") set(OpenMP_${LANG}_FIND_QUIETLY ${OpenMP_FIND_QUIETLY}) set(OpenMP_${LANG}_FIND_REQUIRED ${OpenMP_FIND_REQUIRED}) diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 04687b9..caca697 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -69,7 +69,7 @@ foreach(LANG IN ITEMS C CXX Fortran) if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(_Intel_archdir intel64) else() - set(_Intel_archdir x86) + set(_Intel_archdir ia32) endif() set(_Intel_compiler_ver ${CMAKE_${LANG}_COMPILER_VERSION}) if(WIN32) |