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

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

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