From c623008376a0758b1cb1b8f404d6a148ce938b8e Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 2 Mar 2011 13:44:13 -0500 Subject: [PATCH] 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. --- Modules/CMakeASMInformation.cmake | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Modules/CMakeASMInformation.cmake b/Modules/CMakeASMInformation.cmake index fb1b97623..d50f351e5 100644 --- a/Modules/CMakeASMInformation.cmake +++ b/Modules/CMakeASMInformation.cmake @@ -104,6 +104,18 @@ IF(NOT CMAKE_ASM${ASM_DIALECT}_LINK_EXECUTABLE) " -o ") 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)