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)
wx_lib_compile_definitions(base PRIVATE wxUSE_BASE=1)
endif()
if(wxUSE_ZLIB)
if(wxUSE_ZLIB)
wx_lib_include_directories(base PRIVATE ${ZLIB_INCLUDE_DIRS})
wx_lib_link_libraries(base PRIVATE ${ZLIB_LIBRARIES})
endif()
@@ -48,7 +48,7 @@ if(UNIX AND wxUSE_SECRETSTORE)
wx_lib_include_directories(base PRIVATE ${LIBSECRET_INCLUDE_DIRS})
wx_lib_link_libraries(base PRIVATE ${LIBSECRET_LIBRARIES})
endif()
if(wxUSE_LIBICONV AND ICONV_LIBRARIES)
if(wxUSE_LIBICONV AND ICONV_FOUND)
wx_lib_include_directories(base PRIVATE ${ICONV_INCLUDE_DIRS})
wx_lib_link_libraries(base PRIVATE ${ICONV_LIBRARIES})
endif()