summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-03-01 13:46:02 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-03-01 13:46:09 (GMT)
commitd687047f99b7fd16c8d6f9b95c44b865426c3ca4 (patch)
tree521889b60859f608aaff623fba23ab0b761c6773 /Modules
parent1a46bc0d2b8e26eb96cb05d1fa4c97781ab503c1 (diff)
parent0a81ea1f12cbaf60ec60b8e4a27c5ea476a655de (diff)
downloadCMake-d687047f99b7fd16c8d6f9b95c44b865426c3ca4.zip
CMake-d687047f99b7fd16c8d6f9b95c44b865426c3ca4.tar.gz
CMake-d687047f99b7fd16c8d6f9b95c44b865426c3ca4.tar.bz2
Merge topic 'genex-LINK_GROUP'
0a81ea1f12 Genex-LINK_GROUP: Add possibility to group libraries at link step a9928eb4a5 SunPro C: ensure LINKER: prefix is usable for all versions 01ff75b2ff cmComputeDepends::LinkEntry: introduce enum to specify item type Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7005
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Compiler/SunPro-C.cmake9
1 files changed, 7 insertions, 2 deletions
diff --git a/Modules/Compiler/SunPro-C.cmake b/Modules/Compiler/SunPro-C.cmake
index c98656f..7a406ac 100644
--- a/Modules/Compiler/SunPro-C.cmake
+++ b/Modules/Compiler/SunPro-C.cmake
@@ -33,8 +33,13 @@ foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Bdynamic")
endforeach()
-set(CMAKE_C_LINKER_WRAPPER_FLAG "-Qoption" "ld" " ")
-set(CMAKE_C_LINKER_WRAPPER_FLAG_SEP ",")
+if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "5.12")
+ set(CMAKE_C_LINKER_WRAPPER_FLAG "-Qoption" "ld" " ")
+ set(CMAKE_C_LINKER_WRAPPER_FLAG_SEP ",")
+else()
+ set(CMAKE_C_LINKER_WRAPPER_FLAG "-Wl,")
+ set(CMAKE_C_LINKER_WRAPPER_FLAG_SEP ",")
+endif()
if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 5.13)
set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c89")