anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build out of the box with win32libs from the kdewin installer

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23924 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2008-03-24 14:19:36 +00:00
parent bb51488435
commit f604b54165
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
INSTALL.cmake
View File

@ -27,7 +27,8 @@ Windows only
* as described in INSTALL.scons * as described in INSTALL.scons
* install win32libs with the 'KDE on Windows' installer * install win32libs with the 'KDE on Windows' installer
http://download.cegit.de/kde-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. If cmake couldn't find these modules set GNUWIN32_DIR, eg.
-DGNUWIN32_DIR=c:\gnuwin32. By default cmake searches in your -DGNUWIN32_DIR=c:\gnuwin32. By default cmake searches in your

2
development/cmake/modules/FindGNUWIN32.cmake
View File

@ -42,7 +42,7 @@ if(WIN32)
endif() endif()
else() else()
if (GNUWIN32_FIND_REQUIRED) if (GNUWIN32_FIND_REQUIRED)
message(SEND_ERROR "Could NOT find GNUWIN32") message(SEND_ERROR "Could NOT find GNUWIN32, please set GNUWIN32_DIR")
endif() endif()
endif() endif()

9
development/cmake/modules/FindZLIB.cmake
View File

@ -11,13 +11,16 @@ endif()
find_path(ZLIB_INCLUDE_DIR zlib.h find_path(ZLIB_INCLUDE_DIR zlib.h
/usr/include /usr/include
/usr/local/include) /usr/local/include
"${GNUWIN32_DIR}"/include)
set(POTENTIAL_Z_LIBS z zlib zdll) set(POTENTIAL_Z_LIBS z zlib zdll)
find_library(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS} find_library(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS}
PATHS "C:\\Programme\\Microsoft Visual Studio 8\\VC\\lib" PATHS
/usr/lib /usr/local/lib) "C:\\Programme\\Microsoft Visual Studio 8\\VC\\lib"
/usr/lib /usr/local/lib
"${GNUWIN32_DIR}"/lib)
if(ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) if(ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
set(ZLIB_FOUND TRUE) set(ZLIB_FOUND TRUE)