mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 13:18:28 +00:00
use module to find support libraries, also search for win32libs( http://www.kdelibs.com/wiki/index.php/3rd-party_libraries_required_for_KDElibs_4 )
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14668 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
28ef49f2d9
commit
4a14a050b4
@ -2,11 +2,13 @@ if (WIN32)
|
|||||||
|
|
||||||
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _progFiles)
|
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _progFiles)
|
||||||
|
|
||||||
find_file(GNUWIN32_DIR gnuwin32
|
find_file(GNUWIN32_DIR gnuwin32 win32libs
|
||||||
|
PATHS
|
||||||
${_progFiles}
|
${_progFiles}
|
||||||
"C:/"
|
"C:/"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
if (GNUWIN32_DIR)
|
if (GNUWIN32_DIR)
|
||||||
set(GNUWIN32_INCLUDE_DIR ${GNUWIN32_DIR}/include)
|
set(GNUWIN32_INCLUDE_DIR ${GNUWIN32_DIR}/include)
|
||||||
set(GNUWIN32_LIBRARY_DIR ${GNUWIN32_DIR}/lib)
|
set(GNUWIN32_LIBRARY_DIR ${GNUWIN32_DIR}/lib)
|
||||||
|
@ -1,10 +1,13 @@
|
|||||||
if(WIN32)
|
if(WIN32)
|
||||||
|
|
||||||
|
find_package(GNUWIN32 REQUIRED)
|
||||||
|
|
||||||
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path)
|
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path)
|
||||||
|
|
||||||
set(_zlib_path ${_prog_path}/zlib)
|
set(_zlib_path ${_prog_path}/zlib)
|
||||||
set(_iconv_path ${_prog_path}/iconv)
|
set(_iconv_path ${_prog_path}/iconv)
|
||||||
set(_gnuwin32_dir ${_prog_path}/gnuwin32)
|
|
||||||
|
set(_gnuwin32_dir ${GNUWIN32_DIR})
|
||||||
|
|
||||||
set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH}
|
set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH}
|
||||||
${_gnuwin32_dir}/include
|
${_gnuwin32_dir}/include
|
||||||
|
Loading…
Reference in New Issue
Block a user