diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2019-12-26 16:00:18 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-12-26 16:00:25 (GMT) |
| commit | 979faa46967b2c3c6a2f4e1537b62d6882f7bdd7 (patch) | |
| tree | c813a7c6c5eec3dc5a5c751bc74705d4bb10dbfc /Modules | |
| parent | 5f404e67701fb3f43548a3863cfb081b5a493bfe (diff) | |
| parent | 576c2e7a2d537f95c83a552e722203c5164c6e78 (diff) | |
| download | CMake-979faa46967b2c3c6a2f4e1537b62d6882f7bdd7.zip CMake-979faa46967b2c3c6a2f4e1537b62d6882f7bdd7.tar.gz CMake-979faa46967b2c3c6a2f4e1537b62d6882f7bdd7.tar.bz2 | |
Merge topic 'implib'
576c2e7a2d Swift: move windows handling into platform file (NFC)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4156
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeSwiftInformation.cmake | 4 | ||||
| -rw-r--r-- | Modules/Platform/Windows-Apple-Swift.cmake | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Modules/CMakeSwiftInformation.cmake b/Modules/CMakeSwiftInformation.cmake index 2c54da0..672d3f8 100644 --- a/Modules/CMakeSwiftInformation.cmake +++ b/Modules/CMakeSwiftInformation.cmake @@ -72,10 +72,6 @@ if(NOT CMAKE_Swift_NUM_THREADS MATCHES "^[0-9]+$") cmake_host_system_information(RESULT CMAKE_Swift_NUM_THREADS QUERY NUMBER_OF_LOGICAL_CORES) endif() -if(CMAKE_SYSTEM_NAME STREQUAL Windows) - set(CMAKE_Swift_IMPLIB_LINKER_FLAGS "-Xlinker -implib:<TARGET_IMPLIB>") -endif() - if(NOT CMAKE_Swift_CREATE_SHARED_LIBRARY) set(CMAKE_Swift_CREATE_SHARED_LIBRARY "<CMAKE_Swift_COMPILER> -output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -j ${CMAKE_Swift_NUM_THREADS} -emit-library -o <TARGET> -module-name <SWIFT_MODULE_NAME> -module-link-name <SWIFT_LIBRARY_NAME> -emit-module -emit-module-path <SWIFT_MODULE> -emit-dependencies <DEFINES> <FLAGS> <INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> ${CMAKE_Swift_IMPLIB_LINKER_FLAGS} <LINK_LIBRARIES>") endif() diff --git a/Modules/Platform/Windows-Apple-Swift.cmake b/Modules/Platform/Windows-Apple-Swift.cmake new file mode 100644 index 0000000..1177755 --- /dev/null +++ b/Modules/Platform/Windows-Apple-Swift.cmake @@ -0,0 +1 @@ +set(CMAKE_Swift_IMPLIB_LINKER_FLAGS "-Xlinker -implib:<TARGET_IMPLIB>") |