anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

also build without gnuwin32 directory

Browse Source
This commit is contained in:
Peter Kümmel 2015-12-09 20:48:27 +01:00
parent 584c3a6f7b
commit 7d2c054611
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -139,6 +139,7 @@ LYX_OPTION(ENABLE_URLTESTS "Enable for URL tests" OFF ALL)
LYX_OPTION(ENABLE_EXPORT_TESTS "Enable for export tests" OFF ALL)
LYX_OPTION(ASAN "Use address sanitizer" OFF ALL)
LYX_COMBO(USE_QT "Use Qt version as frontend" QT4 QT5)
LYX_OPTION(3RDPARTY_BUILD "Build 3rdparty libs" OFF ALL)
# GCC specific
LYX_OPTION(PROFILE "Build profile version" OFF GCC)

17
development/cmake/modules/LyXPaths.cmake
View File

@ -25,11 +25,11 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
if(WIN32)
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")
@ -52,9 +52,12 @@ if(WINDEPS)
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)
@ -76,11 +79,7 @@ set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH}
#chek_include_files path
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${_gnuwin32_dir}/include)
else()
set(_prog_path ~/bin)
endif()
endif()