diff options
| author | Pierre Ossman <ossman@cendio.se> | 2022-11-16 07:55:03 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2023-01-10 19:41:13 +0100 |
| commit | b1943de68662d5adc216b809e640009e617c09ed (patch) | |
| tree | bff3107f8fc9e2a764b61b6d14147f7cc659d323 /cmake/Modules | |
| parent | e41b08292872531535518b20d32b1885db3cce48 (diff) | |
| download | tigervnc-b1943de68662d5adc216b809e640009e617c09ed.tar.gz tigervnc-b1943de68662d5adc216b809e640009e617c09ed.zip | |
Include other targets in .la files
We have internal dependencies that should be respected, as otherwise it
will be up to the user of the .la file to figure out the correct order
of the libraries.
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/CMakeMacroLibtoolFile.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmake/Modules/CMakeMacroLibtoolFile.cmake b/cmake/Modules/CMakeMacroLibtoolFile.cmake index 4f3c9021..88ff335a 100644 --- a/cmake/Modules/CMakeMacroLibtoolFile.cmake +++ b/cmake/Modules/CMakeMacroLibtoolFile.cmake @@ -62,8 +62,11 @@ macro(libtool_create_control_file _target) # No shared library extension matched. Check whether target is a CMake # target. if(TARGET ${library}) - # Target is a CMake target, so ignore (CMake targets are static - # libs in TigerVNC.) + # Target is a CMake target, so assume it is a static library and + # build a reference to it + get_target_property(library_path ${library} BINARY_DIR) + set(library ${library_path}/${CMAKE_STATIC_LIBRARY_PREFIX}${library}.la) + set(_target_dependency_libs "${_target_dependency_libs} ${library}") elseif(${library} STREQUAL "-Wl,-Bstatic") # All following libraries should be static set(STATIC_MODE ON) |