Build fixes for windows build

doxygen · Jun 7, 2015 · 5446770 · 5446770
1 parent a92e614
commit 5446770
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,6 +47,7 @@ endif()
 if (WIN32)
     set(ICONV_DIR "${CMAKE_SOURCE_DIR}/winbuild")
     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)
 endif()
 

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -2,7 +2,7 @@ if (build_doc)
 
 find_program(EPSTOPDF NAMES epstopdf )
 find_program(SED NAMES sed )
-find_program(MAKE NAMES make gmake )
+find_program(MAKE NAMES make gmake nmake )
 
 file(GLOB DOC_FILES "*")
 file(GLOB LANG_FILES "${CMAKE_SOURCE_DIR}/src/translator_??.h")