[LyX/master] also build without gnuwin32 directory

[Peter Kümmel]

commit 7d2c054611118cdd60080b296ec5449060f713a6
Author: Peter Kümmel <kuem...@lyx.org>
Date:   Wed Dec 9 20:48:27 2015 +0100

    also build without gnuwin32 directory

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d03194a..e65b259 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,6 +139,7 @@ LYX_OPTION(ENABLE_URLTESTS  "Enable for URL tests" OFF ALL)
 LYX_OPTION(ENABLE_EXPORT_TESTS "Enable for export tests" OFF ALL)
 LYX_OPTION(ASAN             "Use address sanitizer" OFF ALL)
 LYX_COMBO(USE_QT            "Use Qt version as frontend" QT4 QT5)
+LYX_OPTION(3RDPARTY_BUILD   "Build 3rdparty libs" OFF ALL)
 
 # GCC specific
 LYX_OPTION(PROFILE              "Build profile version" OFF GCC)
diff --git a/development/cmake/modules/LyXPaths.cmake 
b/development/cmake/modules/LyXPaths.cmake
index 31fcbc5..fb46fb3 100644
--- a/development/cmake/modules/LyXPaths.cmake
+++ b/development/cmake/modules/LyXPaths.cmake
@@ -25,11 +25,11 @@
 #  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #  
 
-if(WIN32)
-
+if(NOT WIN32)
+       set(_prog_path ~/bin)
+else()
 
 if(WINDEPS)
-
        FIND_PROGRAM(LYX_QMAKE NAMES qmake)
        if(NOT LYX_QMAKE)
                message("------ qmake not found. Add 
YOUR_PATH\\lyx-windows-deps-msvc-qt4\\qt-4\\bin")
@@ -52,36 +52,35 @@ if(WINDEPS)
        set(QT_MOC_EXECUTABLE "${WINDEPSDIR}/qt-4/bin/moc.exe" CACHE TYPE 
STRING FORCE)
        set(QT_UIC_EXECUTABLE "${WINDEPSDIR}/qt-4/bin/uic.exe" CACHE TYPE 
STRING FORCE)
        set(QT_RCC_EXECUTABLE "${WINDEPSDIR}/qt-4/bin/rcc.exe" CACHE TYPE 
STRING FORCE)
-
 endif()
 
-find_package(GNUWIN32 REQUIRED)
-
-file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path)
-
-set(_zlib_path ${_prog_path}/zlib)
-set(_iconv_path ${_prog_path}/iconv)
+if(LYX_3RDPARTY_BUILD)
+    find_package(GNUWIN32)
+    file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path)
+else()
+    find_package(GNUWIN32 REQUIRED)
 
-set(_gnuwin32_dir ${GNUWIN32_DIR})
+    file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path)
 
-set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} 
-       ${_gnuwin32_dir}/include
-       ${_zlib_path}/include
-       ${_iconv_path}/include)
-       
-set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} 
-       ${_gnuwin32_dir}/lib
-       ${_zlib_path}/lib
-       ${_iconv_path}/lib)
+    set(_zlib_path ${_prog_path}/zlib)
+    set(_iconv_path ${_prog_path}/iconv)
 
-#chek_include_files path
-set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} 
${_gnuwin32_dir}/include)
+    set(_gnuwin32_dir ${GNUWIN32_DIR})
 
+    set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} 
+            ${_gnuwin32_dir}/include
+            ${_zlib_path}/include
+            ${_iconv_path}/include)
+            
+    set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} 
+            ${_gnuwin32_dir}/lib
+            ${_zlib_path}/lib
+            ${_iconv_path}/lib)
 
-else()
+    #chek_include_files path
+    set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} 
${_gnuwin32_dir}/include)
+endif()
 
-       set(_prog_path ~/bin)
-       
 endif()