diff options
author | Wolfgang Schupp <w.schupp@a1.net> | 2016-12-14 09:37:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-14 09:37:44 +0100 |
commit | 09c28421a50adb4ef2a9beda2be0a23a1c84fa93 (patch) | |
tree | f01163e1fcc3d6b80a120169dc22e341e713821b /project | |
parent | 27dd243ad0cd1a7802fba2175b8cfefe5839df59 (diff) | |
parent | c4c49bfe6839bd02adea8fe4ca4934cf311f01ac (diff) |
Merge pull request #11161 from hudokkow/cmake_fix_libs
[cmake] Fix XPREFIX_LIBRARIES populating in modules
Diffstat (limited to 'project')
-rw-r--r-- | project/cmake/modules/FindMicroHttpd.cmake | 2 | ||||
-rw-r--r-- | project/cmake/modules/FindPython.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/project/cmake/modules/FindMicroHttpd.cmake b/project/cmake/modules/FindMicroHttpd.cmake index 7d011fa438..66178810e9 100644 --- a/project/cmake/modules/FindMicroHttpd.cmake +++ b/project/cmake/modules/FindMicroHttpd.cmake @@ -41,7 +41,7 @@ if(MICROHTTPD_FOUND) list(APPEND MICROHTTPD_LIBRARIES ${GCRYPT_LIBRARY} ${GPGERROR_LIBRARY}) mark_as_advanced(GCRYPT_LIBRARY GPGERROR_LIBRARY) if(NOT APPLE AND NOT CORE_SYSTEM_NAME STREQUAL android) - list(APPEND MICROHTTPD_LIBRARIES "-lrt") + list(APPEND MICROHTTPD_LIBRARIES rt) endif() endif() endif() diff --git a/project/cmake/modules/FindPython.cmake b/project/cmake/modules/FindPython.cmake index c341f00424..b3fae060ee 100644 --- a/project/cmake/modules/FindPython.cmake +++ b/project/cmake/modules/FindPython.cmake @@ -20,7 +20,7 @@ if(KODI_DEPENDSBUILD) find_library(GMP_LIBRARY gmp REQUIRED) if(NOT CORE_SYSTEM_NAME STREQUAL android) - set(PYTHON_DEP_LIBRARIES -lpthread -ldl -lutil) + set(PYTHON_DEP_LIBRARIES pthread dl util) endif() set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES}) |