mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 21:21:32 +00:00
cmake: don't forget command line options
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15403 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
88dac3a062
commit
4cc5d0825d
@ -57,7 +57,6 @@ else(qt3)
|
|||||||
set(qt_postfix qt4)
|
set(qt_postfix qt4)
|
||||||
project(lyx-${qt_postfix})
|
project(lyx-${qt_postfix})
|
||||||
find_package(Qt4 REQUIRED)
|
find_package(Qt4 REQUIRED)
|
||||||
|
|
||||||
endif(qt3)
|
endif(qt3)
|
||||||
|
|
||||||
find_package(ZLIB REQUIRED)
|
find_package(ZLIB REQUIRED)
|
||||||
@ -65,6 +64,7 @@ find_package(ICONV REQUIRED)
|
|||||||
add_definitions(-DHAVE_ICONV=1)
|
add_definitions(-DHAVE_ICONV=1)
|
||||||
|
|
||||||
if(all OR aspell)
|
if(all OR aspell)
|
||||||
|
set(aspell TRUE CACHE TYPE STRING)
|
||||||
find_package(ASPELL REQUIRED)
|
find_package(ASPELL REQUIRED)
|
||||||
else(all OR aspell)
|
else(all OR aspell)
|
||||||
find_package(ASPELL)
|
find_package(ASPELL)
|
||||||
@ -73,6 +73,7 @@ set(aspell)
|
|||||||
|
|
||||||
message("")
|
message("")
|
||||||
if(nls OR all)
|
if(nls OR all)
|
||||||
|
set(nls TRUE CACHE TYPE STRING)
|
||||||
add_definitions(-DENABLE_NLS=1)
|
add_definitions(-DENABLE_NLS=1)
|
||||||
message("----- Building with ENABLE_NLS")
|
message("----- Building with ENABLE_NLS")
|
||||||
else(nls OR all)
|
else(nls OR all)
|
||||||
|
@ -19,6 +19,8 @@ if(NOT GNUWIN32_DIR)
|
|||||||
)
|
)
|
||||||
set(GNUWIN32_DIR ${GNUWIN32_DIR_tmp})
|
set(GNUWIN32_DIR ${GNUWIN32_DIR_tmp})
|
||||||
endif(NOT GNUWIN32_DIR)
|
endif(NOT GNUWIN32_DIR)
|
||||||
|
else(NOT GNUWIN32_DIR)
|
||||||
|
SET(GNUWIN32_DIR ${GNUWIN32_DIR} CACHE TYPE STRING)
|
||||||
endif(NOT GNUWIN32_DIR)
|
endif(NOT GNUWIN32_DIR)
|
||||||
|
|
||||||
if (GNUWIN32_DIR)
|
if (GNUWIN32_DIR)
|
||||||
|
Loading…
Reference in New Issue
Block a user