diff options
| author | Brad King <brad.king@kitware.com> | 2008-01-31 12:50:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-01-31 12:50:40 (GMT) |
| commit | 3a05425309dd19f4c91febdf96b4ac3fc1d17ce5 (patch) | |
| tree | 4f14c27a2a15110486bb93ade1c50b17154ee977 /Modules | |
| parent | 73a5f0846f4946d74bbe7822fdf5458481e03362 (diff) | |
| download | CMake-3a05425309dd19f4c91febdf96b4ac3fc1d17ce5.zip CMake-3a05425309dd19f4c91febdf96b4ac3fc1d17ce5.tar.gz CMake-3a05425309dd19f4c91febdf96b4ac3fc1d17ce5.tar.bz2 | |
BUG: Move decision to switch library paths found in implicit link directories to use -l options from cmFindLibraryCommand to cmComputeLinkInformation. Existing projects may depend on find_library returning a full path. This slightly weakens cmComputeLinkInformation but is necessary for compatibility.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/IRIX.cmake | 9 | ||||
| -rw-r--r-- | Modules/Platform/IRIX64.cmake | 10 |
2 files changed, 19 insertions, 0 deletions
diff --git a/Modules/Platform/IRIX.cmake b/Modules/Platform/IRIX.cmake index 5452280..b782475 100644 --- a/Modules/Platform/IRIX.cmake +++ b/Modules/Platform/IRIX.cmake @@ -31,3 +31,12 @@ IF(NOT CMAKE_COMPILER_IS_GNUCXX) "mv `basename \"<SOURCE>\" | sed 's/\\.[^./]*$$//'`.s <ASSEMBLY_SOURCE>" ) ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX) + +# Initialize C link type selection flags. These flags are used when +# building a shared library, shared module, or executable that links +# to other libraries to select whether to use the static or shared +# versions of the libraries. +FOREACH(type SHARED_LIBRARY SHARED_MODULE EXE) + SET(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic") + SET(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic") +ENDFOREACH(type) diff --git a/Modules/Platform/IRIX64.cmake b/Modules/Platform/IRIX64.cmake index 1229947..5df3e06 100644 --- a/Modules/Platform/IRIX64.cmake +++ b/Modules/Platform/IRIX64.cmake @@ -60,3 +60,13 @@ IF(NOT CMAKE_COMPILER_IS_GNUCXX) "mv `basename \"<SOURCE>\" | sed 's/\\.[^./]*$$//'`.s <ASSEMBLY_SOURCE>" ) ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX) + +# Initialize C link type selection flags. These flags are used when +# building a shared library, shared module, or executable that links +# to other libraries to select whether to use the static or shared +# versions of the libraries. +FOREACH(type SHARED_LIBRARY SHARED_MODULE EXE) + SET(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic") + SET(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic") +ENDFOREACH(type) + |