templates: save all files with latest LyX 2.2git

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9a8027894b423054867b44835c7db6996b47f41..e10ab3d8326dcaad151600c172fb70f50d902f82 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -648,7 +648,7 @@ if(PYTHONINTERP_FOUND)
   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)
@@ -713,8 +713,8 @@ else()
        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()