mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
build out of the box with win32libs from the kdewin installer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23924 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
bb51488435
commit
f604b54165
@ -27,7 +27,8 @@ Windows only
|
||||
* as described in INSTALL.scons
|
||||
* install win32libs with the 'KDE on Windows' installer
|
||||
http://download.cegit.de/kde-windows/installer/
|
||||
(there are also Qt packages for msvc and mingw)
|
||||
- use the msvc packages
|
||||
- a release version of Qt is also available by the installer
|
||||
|
||||
If cmake couldn't find these modules set GNUWIN32_DIR, eg.
|
||||
-DGNUWIN32_DIR=c:\gnuwin32. By default cmake searches in your
|
||||
|
@ -42,7 +42,7 @@ if(WIN32)
|
||||
endif()
|
||||
else()
|
||||
if (GNUWIN32_FIND_REQUIRED)
|
||||
message(SEND_ERROR "Could NOT find GNUWIN32")
|
||||
message(SEND_ERROR "Could NOT find GNUWIN32, please set GNUWIN32_DIR")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
@ -11,13 +11,16 @@ endif()
|
||||
|
||||
find_path(ZLIB_INCLUDE_DIR zlib.h
|
||||
/usr/include
|
||||
/usr/local/include)
|
||||
/usr/local/include
|
||||
"${GNUWIN32_DIR}"/include)
|
||||
|
||||
set(POTENTIAL_Z_LIBS z zlib zdll)
|
||||
|
||||
find_library(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS}
|
||||
PATHS "C:\\Programme\\Microsoft Visual Studio 8\\VC\\lib"
|
||||
/usr/lib /usr/local/lib)
|
||||
PATHS
|
||||
"C:\\Programme\\Microsoft Visual Studio 8\\VC\\lib"
|
||||
/usr/lib /usr/local/lib
|
||||
"${GNUWIN32_DIR}"/lib)
|
||||
|
||||
if(ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
|
||||
set(ZLIB_FOUND TRUE)
|
||||
|
Loading…
Reference in New Issue
Block a user