diff options
| -rw-r--r-- | Help/variable/CMAKE_INSTALL_PREFIX.rst | 2 | ||||
| -rw-r--r-- | Modules/Compiler/Intel-C.cmake | 8 | ||||
| -rw-r--r-- | Modules/FindHDF5.cmake | 2 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Utilities/Sphinx/CMakeLists.txt | 19 |
5 files changed, 18 insertions, 15 deletions
diff --git a/Help/variable/CMAKE_INSTALL_PREFIX.rst b/Help/variable/CMAKE_INSTALL_PREFIX.rst index 3f3347f..86f1944 100644 --- a/Help/variable/CMAKE_INSTALL_PREFIX.rst +++ b/Help/variable/CMAKE_INSTALL_PREFIX.rst @@ -5,7 +5,7 @@ Install directory used by :command:`install`. If ``make install`` is invoked or ``INSTALL`` is built, this directory is prepended onto all install directories. This variable defaults to -``/usr/local`` on UNIX and ``c:/Program Files`` on Windows. +``/usr/local`` on UNIX and ``c:/Program Files/${PROJECT_NAME}`` on Windows. On UNIX one can use the ``DESTDIR`` mechanism in order to relocate the whole installation. ``DESTDIR`` means DESTination DIRectory. It is diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake index cf366da..1d09bd5 100644 --- a/Modules/Compiler/Intel-C.cmake +++ b/Modules/Compiler/Intel-C.cmake @@ -15,14 +15,14 @@ endif() if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0) set(CMAKE_C11_STANDARD_COMPILE_OPTION "${_std}=c11") - set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=c11") + set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=gnu11") endif() -if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1) +if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0) set(CMAKE_C90_STANDARD_COMPILE_OPTION "${_std}=c89") - set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=c89") + set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=gnu89") set(CMAKE_C99_STANDARD_COMPILE_OPTION "${_std}=c99") - set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=c99") + set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=gnu99") endif() if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1) diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index 50e1892..a898386 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -332,7 +332,7 @@ macro( _HDF5_parse_compile_line set( RE " -D([^ ]*)") string( REGEX MATCHALL "${RE}" definition_flags "${${compile_line_var}}" ) foreach( DEF IN LISTS definition_flags ) - string( REGEX REPLACE "${RE}" "\\1" DEF "${DEF}" ) + string( STRIP "${DEF}" DEF ) list( APPEND ${definitions} ${DEF} ) endforeach() diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f203b3c..a742e33 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 6) -set(CMake_VERSION_PATCH 20160802) +set(CMake_VERSION_PATCH 20160803) #set(CMake_VERSION_RC 1) diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt index 257ba62..45f79dd 100644 --- a/Utilities/Sphinx/CMakeLists.txt +++ b/Utilities/Sphinx/CMakeLists.txt @@ -156,18 +156,21 @@ if(SPHINX_MAN) if("x${m}" MATCHES "^x(.+)\\.([1-9])\\.rst$") set(name "${CMAKE_MATCH_1}") set(sec "${CMAKE_MATCH_2}") + set(skip FALSE) if(NOT CMakeHelp_STANDALONE) if(name STREQUAL "ccmake" AND NOT BUILD_CursesDialog) - continue() - endif() - if(name STREQUAL "cmake-gui" AND NOT BUILD_QtDialog) - continue() + set(skip TRUE) + elseif(name STREQUAL "cmake-gui" AND NOT BUILD_QtDialog) + set(skip TRUE) endif() endif() - CMake_OPTIONAL_COMPONENT(sphinx-man) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/${name}.${sec} - DESTINATION ${CMAKE_MAN_DIR}/man${sec} - ${COMPONENT}) + if(NOT skip) + CMake_OPTIONAL_COMPONENT(sphinx-man) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/${name}.${sec} + DESTINATION ${CMAKE_MAN_DIR}/man${sec} + ${COMPONENT}) + endif() + unset(skip) endif() endforeach() endif() |