Skip to content

Commit

Permalink
allow building with custom iconv on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
alex85k committed Oct 28, 2015
1 parent 3a31868 commit 3d684f6
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ if (${CMAKE_SYSTEM} MATCHES "Darwin")
endif()

if (WIN32)
set(ICONV_DIR "${CMAKE_SOURCE_DIR}/winbuild")
if(NOT ICONV_DIR)
set(ICONV_DIR "${CMAKE_SOURCE_DIR}/winbuild")
endif()
set(CMAKE_REQUIRED_DEFINITIONS "-DLIBICONV_STATIC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # needed for language.cpp on 64bit
add_definitions(-DLIBICONV_STATIC -D_CRT_SECURE_NO_WARNINGS)
Expand Down

0 comments on commit 3d684f6

Please sign in to comment.