AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CMake: Add include directories and libraries for all packages

Browse Source 
lzma.h could not be found when building with wxUSE_LIBLZMA on macOS. Add
the found include directories and libraries from find_package(LibLZMA)
to the base library.

For consistency, add the include directories and libraries of all
find_package usage.

Closes https://github.com/wxWidgets/wxWidgets/pull/1024
This commit is contained in:
Maarten Bent 2018-11-17 19:28:27 +01:00 committed by Vadim Zeitlin
parent 8dbebf9164
commit 660fbca82d
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build/cmake/lib/base/CMakeLists.txt
View File

@ -27,28 +27,35 @@ elseif(UNIX)
endif() endif()
wx_add_library(base IS_BASE ${BASE_FILES}) wx_add_library(base IS_BASE ${BASE_FILES})
wx_lib_link_libraries(base PRIVATE
${ZLIB_LIBRARIES}
${REGEX_LIBRARIES}
)
if(NOT wxBUILD_MONOLITHIC) if(NOT wxBUILD_MONOLITHIC)
wx_lib_compile_definitions(base PRIVATE wxUSE_BASE=1) wx_lib_compile_definitions(base PRIVATE wxUSE_BASE=1)
endif() endif()
if(wxUSE_ZLIB) if(wxUSE_ZLIB)
wx_lib_include_directories(base PRIVATE ${ZLIB_INCLUDE_DIRS}) wx_lib_include_directories(base PRIVATE ${ZLIB_INCLUDE_DIRS})
wx_lib_link_libraries(base PRIVATE ${ZLIB_LIBRARIES})
endif() endif()
if(wxUSE_REGEX) if(wxUSE_REGEX)
wx_lib_include_directories(base PRIVATE ${REGEX_INCLUDE_DIRS}) wx_lib_include_directories(base PRIVATE ${REGEX_INCLUDE_DIRS})
wx_lib_link_libraries(base PRIVATE ${REGEX_LIBRARIES})
endif() endif()
if(LIBSECRET_FOUND) if(wxUSE_LIBLZMA)
wx_lib_include_directories(base PRIVATE ${LIBLZMA_INCLUDE_DIRS})
wx_lib_link_libraries(base PRIVATE ${LIBLZMA_LIBRARIES})
endif()
if(UNIX AND wxUSE_SECRETSTORE)
wx_lib_include_directories(base PRIVATE ${LIBSECRET_INCLUDE_DIRS}) wx_lib_include_directories(base PRIVATE ${LIBSECRET_INCLUDE_DIRS})
wx_lib_link_libraries(base PRIVATE ${LIBSECRET_LIBRARIES})
endif() endif()
if(wxUSE_LIBICONV AND ICONV_LIBRARIES) if(wxUSE_LIBICONV AND ICONV_LIBRARIES)
wx_lib_include_directories(base PRIVATE ${ICONV_INCLUDE_DIRS})
wx_lib_link_libraries(base PRIVATE ${ICONV_LIBRARIES}) wx_lib_link_libraries(base PRIVATE ${ICONV_LIBRARIES})
endif() endif()
if(wxUSE_THREADS AND CMAKE_THREAD_LIBS_INIT) if(wxUSE_THREADS AND CMAKE_THREAD_LIBS_INIT)
wx_lib_link_libraries(base PRIVATE ${CMAKE_THREAD_LIBS_INIT}) wx_lib_link_libraries(base PRIVATE ${CMAKE_THREAD_LIBS_INIT})
endif() endif()
if(APPLE) if(APPLE)
wx_lib_link_libraries(base wx_lib_link_libraries(base
PRIVATE PRIVATE
@ -60,10 +67,7 @@ if(APPLE)
"-framework IOKit" "-framework IOKit"
) )
elseif(UNIX) elseif(UNIX)
wx_lib_link_libraries(base PRIVATE wx_lib_link_libraries(base PRIVATE dl)
dl
${LIBSECRET_LIBRARIES}
)
endif() endif()
wx_finalize_lib(base) wx_finalize_lib(base)