diff options
| author | Brad King <brad.king@kitware.com> | 2011-03-02 18:44:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-03-02 18:44:13 (GMT) |
| commit | c623008376a0758b1cb1b8f404d6a148ce938b8e (patch) | |
| tree | f93e4c65a6e342b34c82cbb55c4134f3828e2652 /Modules | |
| parent | 17c658f819cee5af4854239f8d4aa6b0f51970ce (diff) | |
| download | CMake-c623008376a0758b1cb1b8f404d6a148ce938b8e.zip CMake-c623008376a0758b1cb1b8f404d6a148ce938b8e.tar.gz CMake-c623008376a0758b1cb1b8f404d6a148ce938b8e.tar.bz2 | |
Initialize ASM rpath flags for executables with those for shared libs
Since the flags for executables are almost always the same as those for
shared libraries each language information file just uses the latter for
the former by default. This reduces duplication in the compiler and
platform flag information files.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeASMInformation.cmake | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Modules/CMakeASMInformation.cmake b/Modules/CMakeASMInformation.cmake index fb1b976..d50f351 100644 --- a/Modules/CMakeASMInformation.cmake +++ b/Modules/CMakeASMInformation.cmake @@ -104,6 +104,18 @@ IF(NOT CMAKE_ASM${ASM_DIALECT}_LINK_EXECUTABLE) "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <FLAGS> <CMAKE_ASM${ASM_DIALECT}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") ENDIF(NOT CMAKE_ASM${ASM_DIALECT}_LINK_EXECUTABLE) +IF(NOT CMAKE_EXECUTABLE_RUNTIME_ASM${ASM_DIALECT}_FLAG) + SET(CMAKE_EXECUTABLE_RUNTIME_ASM${ASM_DIALECT}_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_ASM${ASM_DIALECT}_FLAG}) +ENDIF() + +IF(NOT CMAKE_EXECUTABLE_RUNTIME_ASM${ASM_DIALECT}_FLAG_SEP) + SET(CMAKE_EXECUTABLE_RUNTIME_ASM${ASM_DIALECT}_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_ASM${ASM_DIALECT}_FLAG_SEP}) +ENDIF() + +IF(NOT CMAKE_EXECUTABLE_RPATH_LINK_ASM${ASM_DIALECT}_FLAG) + SET(CMAKE_EXECUTABLE_RPATH_LINK_ASM${ASM_DIALECT}_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_ASM${ASM_DIALECT}_FLAG}) +ENDIF() + # to be done IF(NOT CMAKE_ASM${ASM_DIALECT}_CREATE_SHARED_LIBRARY) SET(CMAKE_ASM${ASM_DIALECT}_CREATE_SHARED_LIBRARY) |