es.po: updates by Ignacio

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 848160a3f11faceb1609e6c098e8f40a3c56eafe..39880f24ef63f35da39e8fcf29e4d7167fdd5a89 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -613,7 +613,7 @@ set(Spelling_FOUND OFF)
 set(Include_used_spellchecker)   # String will be inserted into config.h
 
 if(LYX_3RDPARTY_BUILD)
-    add_subdirectory(src/3rdparty/hunspell)
+    add_subdirectory(3rdparty/hunspell)
     add_definitions(-DHUNSPELL_STATIC)
     set(HUNSPELL_FOUND ON)
     message(STATUS "  * Hunspell:")
@@ -640,24 +640,25 @@ foreach(_spell "ASPELL" "Enchant" "Hunspell")
   endif()
 endforeach()
 
+if(NOT LYX_PYTHON_EXECUTABLE)
+       find_package(PythonInterp 2.7 QUIET)
+       if(PYTHONINTERP_FOUND)
+         if(PYTHON_VERSION_STRING VERSION_GREATER 2.8)
+               unset(PYTHONINTERP_FOUND)
+         endif()
+       endif()
 
-find_package(PythonInterp 2.7 QUIET)
-if(PYTHONINTERP_FOUND)
-  if(PYTHON_VERSION_STRING VERSION_GREATER 2.8)
-    unset(PYTHONINTERP_FOUND)
-  endif()
-endif()
+       if(NOT PYTHONINTERP_FOUND AND NOT GNUWIN32_DIR)
+         unset(PYTHON_EXECUTABLE CACHE)
+         unset(PYTHON_VERSION_MAJOR)
+         unset(PYTHON_VERSION_MINOR)
+         unset(PYTHON_VERSION_STRING)
+         find_package(PythonInterp 3.3 REQUIRED)
+       endif()
 
-if (NOT PYTHONINTERP_FOUND)
-  unset(PYTHON_EXECUTABLE CACHE)
-  unset(PYTHON_VERSION_MAJOR)
-  unset(PYTHON_VERSION_MINOR)
-  unset(PYTHON_VERSION_STRING)
-  find_package(PythonInterp 3.3 REQUIRED)
+       set(LYX_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
 endif()
 
-set(LYX_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
-
 if(LYX_NLS)
        find_package(LyXGettext)
        if(LYX_PYTHON_EXECUTABLE AND GETTEXT_FOUND)
@@ -676,15 +677,14 @@ endif()
 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(src/3rdparty/libiconv)
-    set(HAVE_ICONV_CONST 1)
-    add_subdirectory(src/3rdparty/zlib)
-endif()
-
-
 if(LYX_EXTERNAL_BOOST)
        message(STATUS "Searching for boost")
        if(LYX_USE_STD_REGEX)
@@ -714,8 +714,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()