diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-22 14:37:22 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-22 14:37:57 (GMT) |
| commit | c9d9a3fb39ff36dd2818238916697f685b6ccea7 (patch) | |
| tree | 51581b26c4e166192b5491491cbefb035a4f7aa0 /Modules/Compiler | |
| parent | a152e97e2354a0396ab8f8433d61e8f8da7da7f5 (diff) | |
| parent | 4eb15824b3092866f9c30d7af3221487c60fab07 (diff) | |
| download | CMake-c9d9a3fb39ff36dd2818238916697f685b6ccea7.zip CMake-c9d9a3fb39ff36dd2818238916697f685b6ccea7.tar.gz CMake-c9d9a3fb39ff36dd2818238916697f685b6ccea7.tar.bz2 | |
Merge topic 'pgi-fix-windows'
4eb15824 Windows-PGI: Add platform definitions
a94ae96e Windows-PGI: Adapt default compiler flags
c2c2d366 ImplicitLinkInfo: Add support for PGI on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !794
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/PGI.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Modules/Compiler/PGI.cmake b/Modules/Compiler/PGI.cmake index bdabeba..0cbfd8a 100644 --- a/Modules/Compiler/PGI.cmake +++ b/Modules/Compiler/PGI.cmake @@ -18,9 +18,17 @@ macro(__compiler_pgi lang) string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0") string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -O2 -s") - string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -fast -O3 -Mipa=fast") + string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -fast -O3") + # -Mipa was dropped with PGI 16.3 from Windows versions + if(NOT CMAKE_HOST_WIN32 OR CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 16.3) + string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -Mipa=fast") + endif() string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt") + if(CMAKE_HOST_WIN32) + string(APPEND CMAKE_${lang}_FLAGS_INIT " -Bdynamic") + endif() + # Preprocessing and assembly rules. set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>") set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>") |