endif()
endif()
-if (NOT PYTHONINTERP_FOUND)
+if(NOT PYTHONINTERP_FOUND AND NOT GNUWIN32_DIR)
unset(PYTHON_EXECUTABLE CACHE)
unset(PYTHON_VERSION_MAJOR)
unset(PYTHON_VERSION_MINOR)
if(UNIX)
find_package(ICONV REQUIRED)
find_package(ZLIB REQUIRED)
+else()
+ if(LYX_3RDPARTY_BUILD)
+ add_subdirectory(3rdparty/libiconv)
+ set(HAVE_ICONV_CONST 1)
+ add_subdirectory(3rdparty/zlib)
+ endif()
endif()
-if(LYX_3RDPARTY_BUILD)
- add_subdirectory(3rdparty/libiconv)
- set(HAVE_ICONV_CONST 1)
- add_subdirectory(3rdparty/zlib)
-endif()
-
-
if(LYX_EXTERNAL_BOOST)
message(STATUS "Searching for boost")
if(LYX_USE_STD_REGEX)
endif()
add_definitions(-DBOOST_USER_CONFIG="<config.h>")
add_definitions(-DBOOST_SIGNALS_NO_DEPRECATION_WARNING=1)
- include_directories(${TOP_SRC_DIR}/boost)
- add_subdirectory(boost "${TOP_BINARY_DIR}/boost")
+ include_directories(${TOP_SRC_DIR}/3rdparty/boost)
+ add_subdirectory(3rdparty/boost "${TOP_BINARY_DIR}/3rdparty/boost")
endif()