X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fmodules%2FLyXPaths.cmake;h=fb46fb3c6b903decfdcd6f9c630b7ab4b2db8617;hb=9dd695b17adfd47a35ea49b9c19cf5984d2d68be;hp=d9ae43dd3954a9b724fa1258e52dc123cb9f13f1;hpb=7c9876766ccf3e8bfc7db5aad975614b810d33ab;p=lyx.git

diff --git a/development/cmake/modules/LyXPaths.cmake b/development/cmake/modules/LyXPaths.cmake
index d9ae43dd39..fb46fb3c6b 100644
--- a/development/cmake/modules/LyXPaths.cmake
+++ b/development/cmake/modules/LyXPaths.cmake
@@ -25,48 +25,70 @@
 #  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #  
 
-if(WIN32)
-
-find_package(GNUWIN32 REQUIRED)
-
-file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path)
-
-set(_zlib_path ${_prog_path}/zlib)
-set(_iconv_path ${_prog_path}/iconv)
-
-set(_gnuwin32_dir ${GNUWIN32_DIR})
-
-set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} 
-	${_gnuwin32_dir}/include
-	${_zlib_path}/include
-	${_iconv_path}/include
-	)
+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")
+		message("------ to PATH: set PATH=%PATH%;YOUR_PATH\\lyx-windows-deps-msvc-qt4\\qt-4\\bin")
+		message(FATAL_ERROR "Exit.")
+	else()
+		GET_FILENAME_COMPONENT(LYX_QMAKE_PATH ${LYX_QMAKE} PATH)
+		set(WINDEPSDIR "${LYX_QMAKE_PATH}/../..")
+	endif()
 	
-set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} 
-	${_gnuwin32_dir}/lib
-	${_zlib_path}/lib
-	${_iconv_path}/lib
-	)
-
-#chek_include_files path
-set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${_gnuwin32_dir}/include)
-
-
-else(WIN32)
-
-	set(_prog_path ~/bin)
+	set(GNUWIN32_DIR ${WINDEPSDIR})
 	
-endif(WIN32)
-
+	# don't stop in FindQt4.cmake because qmake will
+	# report wrong paths
+	set(QT_HEADERS_DIR "${WINDEPSDIR}/qt-4/include" CACHE TYPE STRING FORCE)
+	set(QT_LIBRARY_DIR "${WINDEPSDIR}/qt-4/lib" CACHE TYPE STRING FORCE)
+	set(QT_BINARY_DIR  "${WINDEPSDIR}/qt-4/bin" CACHE TYPE STRING FORCE)
+	set(QT_MKSPECS_DIR "${WINDEPSDIR}/qt-4/mkspecs" CACHE TYPE STRING FORCE)
+	set(QT_PLUGINS_DIR "${WINDEPSDIR}/qt-4/plugins" CACHE TYPE STRING FORCE)
+	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()
+
+if(LYX_3RDPARTY_BUILD)
+    find_package(GNUWIN32)
+    file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path)
+else()
+    find_package(GNUWIN32 REQUIRED)
+
+    file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path)
+
+    set(_zlib_path ${_prog_path}/zlib)
+    set(_iconv_path ${_prog_path}/iconv)
+
+    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)
+
+    #chek_include_files path
+    set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${_gnuwin32_dir}/include)
+endif()
+
+endif()
 
-GET_FILENAME_COMPONENT(lyx_dir_readme ${CMAKE_SOURCE_DIR}/../../README ABSOLUTE)
-GET_FILENAME_COMPONENT(TOP_SRC_DIR ${lyx_dir_readme} PATH)
 
 if(WIN32)
 	set(locale_dir Resources/locale)
-else(WIN32)	
+else()	
 	set(locale_dir share/locale)
-endif(WIN32)
+endif()
 
 set(PREFIX ${_prog_path}/LyX)
 set(LOCAL_DIR ${PREFIX}/${locale_dir})
@@ -74,6 +96,3 @@ set(LOCAL_DIR ${PREFIX}/${locale_dir})
 #message(" PREFIX : ${PREFIX}")
 #message(" LOCAL_DIR : ${LOCAL_DIR}")
 #message(" TOP_SRC_DIR : ${TOP_SRC_DIR}")
-
-
-