[build] restored check of ICONV library for non-mingw builds

aferrero2707 · Aug 7, 2017 · 914561f · 914561f
1 parent 0203956
commit 914561f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,9 +38,12 @@ find_package(PkgConfig)
 find_package (EXPAT)
 MESSAGE( STATUS "EXPAT_INCLUDE_DIRS:         " ${EXPAT_INCLUDE_DIRS} )
 MESSAGE( STATUS "EXPAT_LIBRARIES:            " ${EXPAT_LIBRARIES} )
-#find_package (Iconv REQUIRED)
-#MESSAGE( STATUS "ICONV_INCLUDE_DIRS:         " ${ICONV_INCLUDE_DIRS} )
-#MESSAGE( STATUS "ICONV_LIBRARIES:            " ${ICONV_LIBRARIES} )
+
+IF(NOT MINGW)
+  find_package (Iconv REQUIRED)
+  MESSAGE( STATUS "ICONV_INCLUDE_DIRS:         " ${ICONV_INCLUDE_DIRS} )
+  MESSAGE( STATUS "ICONV_LIBRARIES:            " ${ICONV_LIBRARIES} )
+ENDIF(NOT MINGW)
 
 MESSAGE(STATUS "Check for LCMS2 availability...")
 #FIND_PACKAGE(LCMS2)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -65,7 +65,9 @@ SET(CMAKE_CXX_FLAGS_TEST "            -O3 -g -ftree-vectorize -Wno-unused-parame
 #link_directories("/this/is/a/test/path")
 
 include_directories(${EXPAT_INCLUDE_DIRS})
-#include_directories(${ICONV_INCLUDE_DIRS})
+IF(NOT MINGW)
+  include_directories(${ICONV_INCLUDE_DIRS})
+ENDIF(NOT MINGW)
 
 include_directories(${GLIB_INCLUDE_DIRS})
 link_directories(${GLIB_LIBRARY_DIRS})
@@ -432,7 +434,7 @@ target_link_libraries(photoflow ${LIBS}
   ${VIPS_LIBRARIES} ${VIPSCC_LIBRARIES}
   ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} 
   ${EXPAT_LIBRARIES}
-  #${ICONV_LIBRARIES}
+  ${ICONV_LIBRARIES}
   ${OPENEXR_LIBRARIES}
   ${XML2_LIBRARIES}
   ${EXIF_LIBRARIES}