diff options
| author | h.udo <hudokkow@gmail.com> | 2016-12-13 12:53:05 +0000 |
|---|---|---|
| committer | h.udo <hudokkow@gmail.com> | 2016-12-14 10:07:41 +0000 |
| commit | 50f2135983ba2e51fd999c67b2165e12489fcae8 (patch) | |
| tree | d27c91f90ab50d44dc9dacbf3ccab3ae1270ef4b | |
| parent | ad7b27a47218c7580396d4d8c91622f92ef26de4 (diff) | |
[backport/PR11161][cmake] Fix XPREFIX_LIBRARIES populating in modules
| -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 68b7359417..d2035f629e 100644 --- a/project/cmake/modules/FindPython.cmake +++ b/project/cmake/modules/FindPython.cmake @@ -20,7 +20,7 @@ if(CMAKE_CROSSCOMPILING) 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}) |