diff options
| author | Mike Taves <mwtoews@gmail.com> | 2021-12-05 10:04:21 +1300 |
|---|---|---|
| committer | Mike Taves <mwtoews@gmail.com> | 2021-12-05 10:04:21 +1300 |
| commit | ccb21d563ff0ca928b8055ca6704fcb18de70dfa (patch) | |
| tree | f6a3aa691f342c58316b85fdea4c4ead4fa58c1a /cmake | |
| parent | d76024b781361cc7b024e0bd240880cfaf1d091f (diff) | |
| download | PROJ-ccb21d563ff0ca928b8055ca6704fcb18de70dfa.tar.gz PROJ-ccb21d563ff0ca928b8055ca6704fcb18de70dfa.zip | |
Refactor proj.pc to use EXTRA_LIBS; add -lpthread to Libs.private
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/ProjUtilities.cmake | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/cmake/ProjUtilities.cmake b/cmake/ProjUtilities.cmake index 55d53cbb..333b01f0 100644 --- a/cmake/ProjUtilities.cmake +++ b/cmake/ProjUtilities.cmake @@ -76,21 +76,25 @@ function(configure_proj_pc) set(datadir "$\{datarootdir\}") set(PACKAGE "proj") set(VERSION ${PROJ_VERSION}) - set(SQLITE3_LIBS -lsqlite3) + # Build list for Libs.private + set(EXTRA_LIBS + -lstdc++ + -lsqlite3 + ${CMAKE_THREAD_LIBS_INIT} + ) if(TIFF_ENABLED) - set(TIFF_LIBS -ltiff) + list(APPEND EXTRA_LIBS -ltiff) endif() if(CURL_ENABLED) - set(CURL_LIBS -lcurl) + list(APPEND EXTRA_LIBS -lcurl) endif() - set(EXTRA_LIBS "-lstdc++") if(HAVE_LIBM) - list(APPEND EXTRA_LIBS "-lm") + list(APPEND EXTRA_LIBS -lm) endif() if(HAVE_LIBDL) - list(APPEND EXTRA_LIBS "-ldl") + list(APPEND EXTRA_LIBS -ldl) endif() - # Join list with a space + # Join list with a space; list(JOIN) added CMake 3.12 string(REPLACE ";" " " _tmp_str "${EXTRA_LIBS}") set(EXTRA_LIBS "${_tmp_str}") |