diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-02 10:39:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-02 10:39:44 (GMT) |
| commit | 6950706ca0c656ef1ae2ee296a6bd7f3b4791620 (patch) | |
| tree | 8ebd795eca96b8f5da02907fbe31c1c0e57cbdba | |
| parent | 241dde8de02021d264e9d5a76fb7a63eff1faad6 (diff) | |
| parent | 97fa63c09b5e50bc353b702de011e36f76577dad (diff) | |
| download | CMake-6950706ca0c656ef1ae2ee296a6bd7f3b4791620.zip CMake-6950706ca0c656ef1ae2ee296a6bd7f3b4791620.tar.gz CMake-6950706ca0c656ef1ae2ee296a6bd7f3b4791620.tar.bz2 | |
Merge topic 'asm-preprocessor-flag'
97fa63c09b ASM: Fix preprocessor definition flags for GNU 'as' tool
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4838
| -rw-r--r-- | Modules/Compiler/GNU-ASM.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/BuildDepends/GNU-AS.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Modules/Compiler/GNU-ASM.cmake b/Modules/Compiler/GNU-ASM.cmake index 3daa57d..94af401 100644 --- a/Modules/Compiler/GNU-ASM.cmake +++ b/Modules/Compiler/GNU-ASM.cmake @@ -9,4 +9,5 @@ if(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_MATCH STREQUAL "GNU assembler") set(CMAKE_DEPFILE_FLAGS_ASM${ASM_DIALECT} "--MD <DEPFILE>") set(CMAKE_ASM${ASM_DIALECT}_LINK_EXECUTABLE "<CMAKE_LINKER> <FLAGS> <CMAKE_ASM${ASM_DIALECT}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") + set(CMAKE_ASM_DEFINE_FLAG "--defsym ") endif() diff --git a/Tests/RunCMake/BuildDepends/GNU-AS.cmake b/Tests/RunCMake/BuildDepends/GNU-AS.cmake index 21921ef..0c7249a 100644 --- a/Tests/RunCMake/BuildDepends/GNU-AS.cmake +++ b/Tests/RunCMake/BuildDepends/GNU-AS.cmake @@ -5,6 +5,7 @@ message(STATUS "CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_MATCH='${CMAKE_ASM${A add_library(gnu_as STATIC gnu_as.s) target_include_directories(gnu_as PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +target_compile_definitions(gnu_as PRIVATE "TEST_DEF=Hello") file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/check-$<LOWER_CASE:$<CONFIG>>.cmake CONTENT " set(check_pairs |