Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Put include and link commands on one line

Browse Source 
Use correct check for LIBICONV.
This commit is contained in:
Maarten Bent
2018-12-02 17:33:20 +01:00
parent 29666f1d91
commit c80aecbfc1
4 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,8 +31,8 @@ wx_add_library(base IS_BASE ${BASE_FILES})
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}) wx_lib_link_libraries(base PRIVATE ${ZLIB_LIBRARIES})
endif() endif()
@@ -48,7 +48,7 @@ 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}) wx_lib_link_libraries(base PRIVATE ${LIBSECRET_LIBRARIES})
endif() endif()
if(wxUSE_LIBICONV AND ICONV_LIBRARIES) if(wxUSE_LIBICONV AND ICONV_FOUND)
wx_lib_include_directories(base PRIVATE ${ICONV_INCLUDE_DIRS}) 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()

20
build/cmake/lib/core/CMakeLists.txt
View File

@@ -65,27 +65,17 @@ foreach(lib JPEG PNG TIFF)
endforeach() endforeach()
if(WIN32) if(WIN32)
wx_lib_link_libraries(core PRIVATE wx_lib_link_libraries(core PRIVATE winmm)
winmm
)
endif() endif()
if(WXOSX_COCOA) if(WXOSX_COCOA)
wx_lib_link_libraries(core PUBLIC wx_lib_link_libraries(core PUBLIC "-framework AudioToolbox")
"-framework AudioToolbox"
)
if(wxUSE_WEBKIT) if(wxUSE_WEBKIT)
wx_lib_link_libraries(core PUBLIC wx_lib_link_libraries(core PUBLIC "-framework WebKit")
"-framework WebKit"
)
endif() endif()
endif() endif()
if(WXGTK AND wxUSE_PRIVATE_FONTS) if(WXGTK AND wxUSE_PRIVATE_FONTS)
wx_lib_include_directories(core PUBLIC wx_lib_include_directories(core PUBLIC ${FONTCONFIG_INCLUDE_DIR})
${FONTCONFIG_INCLUDE_DIR} wx_lib_link_libraries(core PUBLIC ${FONTCONFIG_LIBRARIES})
)
wx_lib_link_libraries(core PUBLIC
${FONTCONFIG_LIBRARIES}
)
endif() endif()
if(UNIX AND wxUSE_LIBSDL) if(UNIX AND wxUSE_LIBSDL)
if(SDL2_FOUND) if(SDL2_FOUND)

4
build/cmake/lib/webview/CMakeLists.txt
View File

@@ -33,9 +33,7 @@ if(wxUSE_WEBVIEW_WEBKIT2)
endif() endif()
if(APPLE) if(APPLE)
wx_lib_link_libraries(webview PUBLIC wx_lib_link_libraries(webview PUBLIC "-framework WebKit")
"-framework WebKit"
)
elseif(WXGTK) elseif(WXGTK)
if(LIBSOUP_FOUND) if(LIBSOUP_FOUND)
wx_lib_include_directories(webview PUBLIC ${LIBSOUP_INCLUDE_DIRS}) wx_lib_include_directories(webview PUBLIC ${LIBSOUP_INCLUDE_DIRS})

4
build/cmake/lib/xml/CMakeLists.txt
View File

@@ -11,9 +11,7 @@ include(../../source_groups.cmake)
wx_append_sources(XML_FILES XML) wx_append_sources(XML_FILES XML)
wx_add_library(xml IS_BASE ${XML_FILES}) wx_add_library(xml IS_BASE ${XML_FILES})
wx_lib_link_libraries(xml wx_lib_link_libraries(xml PRIVATE ${EXPAT_LIBRARIES})
PRIVATE ${EXPAT_LIBRARIES}
)
wx_lib_include_directories(xml PRIVATE ${EXPAT_INCLUDE_DIRS}) wx_lib_include_directories(xml PRIVATE ${EXPAT_INCLUDE_DIRS})
wx_finalize_lib(xml) wx_finalize_lib(xml)