Verified Commit 34c35474 authored by Lars Bilke's avatar Lars Bilke

[CMake] Conan Iconv is not required on Linxu.

parent f89e8a41
......@@ -100,10 +100,13 @@ target_include_directories(Xdmf PUBLIC
${PROJECT_SOURCE_DIR}/ThirdParty/xdmf
${PROJECT_BINARY_DIR}/ThirdParty/xdmf
)
if(OGS_USE_CONAN AND UNIX AND APPLE)
find_package(Iconv REQUIRED)
endif()
target_link_libraries(Xdmf Boost::boost ${Iconv_LIBRARIES} ZLIB::ZLIB)
target_include_directories(XdmfCore PUBLIC
${PROJECT_SOURCE_DIR}/ThirdParty/xdmf/core
${PROJECT_BINARY_DIR}/ThirdParty/xdmf/core
)
find_package(LibXml2 REQUIRED) # LibXml2 is a XdmfCore dependency
target_link_libraries(XdmfCore PUBLIC ${Iconv_LIBRARIES} LibXml2::LibXml2)
target_link_libraries(XdmfCore PUBLIC LibXml2::LibXml2)
......@@ -47,6 +47,9 @@ set(CONAN_OPTIONS
vtk:iolegacy=True
CACHE INTERNAL ""
)
if(UNIX AND NOT APPLE)
list(APPEND CONAN_OPTIONS libxml2:iconv=False)
endif()
if((UNIX AND NOT APPLE) AND BUILD_SHARED_LIBS)
set(CONAN_OPTIONS ${CONAN_OPTIONS} vtk:fPIC=True)
......
......@@ -191,5 +191,3 @@ endif()
find_package(Filesystem REQUIRED COMPONENTS Final Experimental)
configure_file(${PROJECT_SOURCE_DIR}/BaseLib/filesystem.h.in
${PROJECT_BINARY_DIR}/BaseLib/filesystem.h)
find_package(Iconv REQUIRED)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment