From 330db5cce1e21125298d3d618d10268d43116637 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Thu, 15 Jun 2006 15:11:25 +0000 Subject: [PATCH] correct svn properties, upadte aspell handling git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14121 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/CMakeLists.txt | 5 + development/cmake/ConfigureChecks.cmake | 0 development/cmake/README.cmake | 80 ++++++------- development/cmake/boost/CMakeLists.txt | 0 development/cmake/boost/libs/CMakeLists.txt | 0 .../boost/libs/filesystem/CMakeLists.txt | 0 .../cmake/boost/libs/iostreams/CMakeLists.txt | 0 .../cmake/boost/libs/regex/CMakeLists.txt | 0 .../cmake/boost/libs/signals/CMakeLists.txt | 0 development/cmake/config.h.cmake | 0 development/cmake/intl/CMakeLists.txt | 0 development/cmake/intl/libgnuintl.h | 0 development/cmake/modules/FindASPELL.cmake | 90 +++++++++----- development/cmake/modules/FindGNUWIN32.cmake | 0 development/cmake/modules/FindICONV.cmake | 112 +++++++++--------- development/cmake/modules/FindQt4.cmake | 0 development/cmake/modules/FindZLIB.cmake | 68 +++++------ development/cmake/modules/LyXMacros.cmake | 0 development/cmake/modules/LyXPaths.cmake | 98 +++++++-------- development/cmake/modules/LyXuic.cmake | 0 .../modules/MacroAddFileDependencies.cmake | 0 development/cmake/src/CMakeLists.txt | 2 +- development/cmake/src/dummy.cpp | 2 +- .../cmake/src/frontends/CMakeLists.txt | 0 .../src/frontends/controllers/CMakeLists.txt | 0 .../cmake/src/frontends/qt4/CMakeLists.txt | 0 development/cmake/src/graphics/CMakeLists.txt | 0 development/cmake/src/insets/CMakeLists.txt | 0 development/cmake/src/mathed/CMakeLists.txt | 0 development/cmake/src/support/CMakeLists.txt | 0 development/cmake/src/support/package.C.cmake | 0 development/cmake/src/tex2lyx/CMakeLists.txt | 0 development/cmake/src/version.C.cmake | 0 33 files changed, 249 insertions(+), 208 deletions(-) mode change 100755 => 100644 development/cmake/CMakeLists.txt mode change 100755 => 100644 development/cmake/ConfigureChecks.cmake mode change 100755 => 100644 development/cmake/README.cmake mode change 100755 => 100644 development/cmake/boost/CMakeLists.txt mode change 100755 => 100644 development/cmake/boost/libs/CMakeLists.txt mode change 100755 => 100644 development/cmake/boost/libs/filesystem/CMakeLists.txt mode change 100755 => 100644 development/cmake/boost/libs/iostreams/CMakeLists.txt mode change 100755 => 100644 development/cmake/boost/libs/regex/CMakeLists.txt mode change 100755 => 100644 development/cmake/boost/libs/signals/CMakeLists.txt mode change 100755 => 100644 development/cmake/config.h.cmake mode change 100755 => 100644 development/cmake/intl/CMakeLists.txt mode change 100755 => 100644 development/cmake/intl/libgnuintl.h mode change 100755 => 100644 development/cmake/modules/FindASPELL.cmake mode change 100755 => 100644 development/cmake/modules/FindGNUWIN32.cmake mode change 100755 => 100644 development/cmake/modules/FindICONV.cmake mode change 100755 => 100644 development/cmake/modules/FindQt4.cmake mode change 100755 => 100644 development/cmake/modules/FindZLIB.cmake mode change 100755 => 100644 development/cmake/modules/LyXMacros.cmake mode change 100755 => 100644 development/cmake/modules/LyXPaths.cmake mode change 100755 => 100644 development/cmake/modules/LyXuic.cmake mode change 100755 => 100644 development/cmake/modules/MacroAddFileDependencies.cmake mode change 100755 => 100644 development/cmake/src/CMakeLists.txt mode change 100755 => 100644 development/cmake/src/dummy.cpp mode change 100755 => 100644 development/cmake/src/frontends/CMakeLists.txt mode change 100755 => 100644 development/cmake/src/frontends/controllers/CMakeLists.txt mode change 100755 => 100644 development/cmake/src/frontends/qt4/CMakeLists.txt mode change 100755 => 100644 development/cmake/src/graphics/CMakeLists.txt mode change 100755 => 100644 development/cmake/src/insets/CMakeLists.txt mode change 100755 => 100644 development/cmake/src/mathed/CMakeLists.txt mode change 100755 => 100644 development/cmake/src/support/CMakeLists.txt mode change 100755 => 100644 development/cmake/src/support/package.C.cmake mode change 100755 => 100644 development/cmake/src/tex2lyx/CMakeLists.txt mode change 100755 => 100644 development/cmake/src/version.C.cmake diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt old mode 100755 new mode 100644 index 7d4c013801..fcbab84648 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -6,6 +6,11 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules") include(LyXPaths) include(LyXMacros) +if(release) + set(CMAKE_BUILD_TYPE TRUE) + set(release) +endif(release) + find_package(Qt4 REQUIRED) find_package(ZLIB REQUIRED) diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake old mode 100755 new mode 100644 diff --git a/development/cmake/README.cmake b/development/cmake/README.cmake old mode 100755 new mode 100644 index 074265e7d2..9860221699 --- a/development/cmake/README.cmake +++ b/development/cmake/README.cmake @@ -1,40 +1,40 @@ -Building LyX with CMake - -For all builds: -- CMake 2.4.2 or CVS version from www.cmake.org -- install Qt 4 and make sure qmake 4 is found - - -Building Visual C++ 2005 project files: -- install Visual C++ 2005 -- install Platform SDK 2005, "Core" and "Web Workshop" -- add include and library paths of the SDK to the IDE search paths, - menu: Tools->Options->VC++ directories->Library files + Include files -- install zlib (www.zlib.net) into %ProgramFiles%/GnuWin32/include+lib - or %ProgramFiles%/zlib/include+lib -- create a build directory, e.g. .../trunk/../build -- call in the build directory 'cmake ..\trunk\development\cmake' -- start lyx.sln - -TIPS: - rename Microsoft Visual Studio 8\VC\vcpackages\feacp.dll - to disable Intellisense - - the Release build links much faster - - -Building with GCC/Linux: -- create a build directory, e.g. .../trunk/../build -- call in the build directory 'cmake ..\trunk\development\cmake' - -Building with GCC/Windows: -- install zlib (www.zlib.net) into %ProgramFiles%/GnuWin32/include+lib -- create a build directory, e.g. .../trunk/../build -- call in the build directory 'cmake ..\trunk\development\cmake' - - -To generate other build files call 'cmake' -which shows a list of possibilities. - - -The build process tries to find aspell and iconv on Windows -in %ProgramFiles%/GnuWin32/ and in /usr/ or in /usr/local -under Linux. If they are not found the support is disabled. +Building LyX with CMake + +For all builds: +- CMake 2.4.2 or CVS version from www.cmake.org +- install Qt 4 and make sure qmake 4 is found + + +Building Visual C++ 2005 project files: +- install Visual C++ 2005 +- install Platform SDK 2005, "Core" and "Web Workshop" +- add include and library paths of the SDK to the IDE search paths, + menu: Tools->Options->VC++ directories->Library files + Include files +- install zlib (www.zlib.net) into %ProgramFiles%/GnuWin32/include+lib + or %ProgramFiles%/zlib/include+lib +- create a build directory, e.g. .../trunk/../build +- call in the build directory 'cmake ..\trunk\development\cmake' +- start lyx.sln + +TIPS: - rename Microsoft Visual Studio 8\VC\vcpackages\feacp.dll + to disable Intellisense + - the Release build links much faster + + +Building with GCC/Linux: +- create a build directory, e.g. .../trunk/../build +- call in the build directory 'cmake ..\trunk\development\cmake' + +Building with GCC/Windows: +- install zlib (www.zlib.net) into %ProgramFiles%/GnuWin32/include+lib +- create a build directory, e.g. .../trunk/../build +- call in the build directory 'cmake ..\trunk\development\cmake' + + +To generate other build files call 'cmake' +which shows a list of possibilities. + + +The build process tries to find aspell and iconv on Windows +in %ProgramFiles%/GnuWin32/ and in /usr/ or in /usr/local +under Linux. If they are not found the support is disabled. diff --git a/development/cmake/boost/CMakeLists.txt b/development/cmake/boost/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/development/cmake/boost/libs/CMakeLists.txt b/development/cmake/boost/libs/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/development/cmake/boost/libs/filesystem/CMakeLists.txt b/development/cmake/boost/libs/filesystem/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/development/cmake/boost/libs/iostreams/CMakeLists.txt b/development/cmake/boost/libs/iostreams/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/development/cmake/boost/libs/regex/CMakeLists.txt b/development/cmake/boost/libs/regex/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/development/cmake/boost/libs/signals/CMakeLists.txt b/development/cmake/boost/libs/signals/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake old mode 100755 new mode 100644 diff --git a/development/cmake/intl/CMakeLists.txt b/development/cmake/intl/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/development/cmake/intl/libgnuintl.h b/development/cmake/intl/libgnuintl.h old mode 100755 new mode 100644 diff --git a/development/cmake/modules/FindASPELL.cmake b/development/cmake/modules/FindASPELL.cmake old mode 100755 new mode 100644 index f67dec8209..af2fad227d --- a/development/cmake/modules/FindASPELL.cmake +++ b/development/cmake/modules/FindASPELL.cmake @@ -1,44 +1,80 @@ # - Try to find ASPELL # Once done this will define # -# ASPELL_FOUND - system has ASPELL -# ASPELL_INCLUDE_DIR - the ASPELL include directory -# ASPELL_LIBRARIES - The libraries needed to use ASPELL -# ASPELL_DEFINITIONS - Compiler switches required for using ASPELL +# ASPELL_FOUND - system has ASPELL +# ASPELL_INCLUDE_DIR - the ASPELL include directory +# ASPELL_LIBRARY - The libraries needed to use ASPELL +# ASPELL_DEFINITIONS - Compiler switches required for using ASPELL # -if (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) - # Already in cache, be silent - set(ASPELL_FIND_QUIETLY TRUE) -endif (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) +if(WIN32) + file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) +endif(WIN32) + + +if (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARY) + # Already in cache, be silent + set(ASPELL_FIND_QUIETLY TRUE) +endif (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARY) FIND_PATH(ASPELL_INCLUDE_DIR aspell.h - /usr/include - /usr/local/include - /usr/local/include/aspell + /usr/include + /usr/local/include + /usr/local/include/aspell + ${_program_FILES_DIR}/gnuwin32/include ) -FIND_LIBRARY(ASPELL_LIBRARIES NAMES aspell aspell-15 libaspell - PATHS - /usr/lib - /usr/local/lib +FIND_LIBRARY(ASPELL_LIBRARY_RELEASE NAMES aspell aspell-15 + PATHS + /usr/lib + /usr/local/lib ) +# msvc makes a difference between debug and release +if(MSVC) + find_library(ASPELL_LIBRARY_DEBUG NAMES aspelld + PATHS + ${_program_FILES_DIR}/kdewin32/lib) + + if(MSVC_IDE) + if(NOT ASPELL_LIBRARY_DEBUG OR NOT ASPELL_LIBRARY_RELEASE) + SET(ASPELL_LIBRARY) + else(NOT ASPELL_LIBRARY_DEBUG OR NOT ASPELL_LIBRARY_RELEASE) + SET(ASPELL_LIBRARY optimized ${ASPELL_LIBRARY_RELEASE} debug ${ASPELL_LIBRARY_DEBUG}) + endif(NOT ASPELL_LIBRARY_DEBUG OR NOT ASPELL_LIBRARY_RELEASE) + else(MSVC_IDE) + string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) + if(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + set(ASPELL_LIBRARY ${ASPELL_LIBRARY_DEBUG}) + else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + set(ASPELL_LIBRARY ${ASPELL_LIBRARY_RELEASE}) + endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + endif(MSVC_IDE) +else(MSVC) + set(ASPELL_LIBRARY ${ASPELL_LIBRARY_RELEASE}) +endif(MSVC) -if (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) - set(ASPELL_FOUND TRUE) -endif (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) +if (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARY) + set(ASPELL_FOUND TRUE) +endif (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARY) if (ASPELL_FOUND) - if (NOT ASPELL_FIND_QUIETLY) - message(STATUS "Found ASPELL: ${ASPELL_LIBRARIES}") - endif (NOT ASPELL_FIND_QUIETLY) + if (NOT ASPELL_FIND_QUIETLY) + message(STATUS "Found ASPELL: ${ASPELL_LIBRARY}") + endif (NOT ASPELL_FIND_QUIETLY) else (ASPELL_FOUND) - if (ASPELL_FIND_REQUIRED) - message("aspell header: ${ASPELL_INCLUDE_DIR}") - message("aspell lib : ${ASPELL_LIBRARIES}") - message(FATAL_ERROR "Could NOT find ASPELL") - endif (ASPELL_FIND_REQUIRED) + if (ASPELL_FIND_REQUIRED) + message("aspell header : ${ASPELL_INCLUDE_DIR}") + message("aspell lib release : ${ASPELL_LIBRARY_RELEASE}") + message("aspell lib debug : ${ASPELL_LIBRARY_DEBUG}") + if(MSVC_IDE) + # the ide needs the debug and release version + if(NOT ASPELL_LIBRARY_DEBUG OR NOT ASPELL_LIBRARY_RELEASE) + message(FATAL_ERROR "\nCould NOT find the debug AND release version of the aspell library.\nYou need to have both to use MSVC projects.\nPlease build and install both kdelibs/win/ libraries first.\n") + endif(NOT ASPELL_LIBRARY_DEBUG OR NOT ASPELL_LIBRARY_RELEASE) + endif(MSVC_IDE) + message(FATAL_ERROR "Could NOT find ASPELL") + endif (ASPELL_FIND_REQUIRED) endif (ASPELL_FOUND) -MARK_AS_ADVANCED(ASPELL_INCLUDE_DIR ASPELL_LIBRARIES) +MARK_AS_ADVANCED(ASPELL_INCLUDE_DIR ASPELL_LIBRARY) diff --git a/development/cmake/modules/FindGNUWIN32.cmake b/development/cmake/modules/FindGNUWIN32.cmake old mode 100755 new mode 100644 diff --git a/development/cmake/modules/FindICONV.cmake b/development/cmake/modules/FindICONV.cmake old mode 100755 new mode 100644 index b602904e02..cec7c1c571 --- a/development/cmake/modules/FindICONV.cmake +++ b/development/cmake/modules/FindICONV.cmake @@ -1,56 +1,56 @@ - -if (ICONV_INCLUDE_DIR) - # Already in cache, be silent - set(ICONV_FIND_QUIETLY TRUE) -endif (ICONV_INCLUDE_DIR) - -FIND_PATH(ICONV_INCLUDE_DIR iconv.h - /usr/include - /usr/local/include -) - -set(POTENTIAL_ICONV_LIBS iconv libiconv) -FIND_LIBRARY(ICONV_LIBRARY NAMES ${POTENTIAL_ICONV_LIBS} -PATHS - /usr/lib - /usr/local/lib -) - -if(WIN32) - FIND_FILE(ICONV_DLL iconv.dll NO_DEFAULT_PATH ENV PATH) - FIND_FILE(ICONV_DLL_HELP iconv.dll) - IF(ICONV_FIND_REQUIRED) - IF(NOT ICONV_DLL AND NOT ICONV_DLL_HELP) - MESSAGE(FATAL_ERROR "Could not find iconv.dll, please add correct your PATH environment variable") - ENDIF(NOT ICONV_DLL AND NOT ICONV_DLL_HELP) - IF(NOT ICONV_DLL AND ICONV_DLL_HELP) - GET_FILENAME_COMPONENT(ICONV_DLL_HELP ${ICONV_DLL_HELP} PATH) - MESSAGE("Could not find iconv.dll in standard search path, please add ") - MESSAGE("${ICONV_DLL_HELP} to your PATH environment variable.") - MESSAGE(FATAL_ERROR) - ENDIF(NOT ICONV_DLL AND ICONV_DLL_HELP) - ENDIF(ICONV_FIND_REQUIRED) -ELSE(WIN32) - set(ICONV_DLL TRUE) -endif(WIN32) - - -IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY AND ICONV_DLL) - SET(ICONV_FOUND TRUE) -ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY AND ICONV_DLL) - -IF (ICONV_FOUND) - IF (NOT ICONV_FIND_QUIETLY) - MESSAGE(STATUS "Found iconv: ${ICONV_LIBRARY}") - ENDIF (NOT ICONV_FIND_QUIETLY) -ELSE (ICONV_FOUND) - IF (ICONV_FIND_REQUIRED) - MESSAGE(STATUS "Looked for iconv library named ${POTENTIAL_ICONV_LIBS}.") - MESSAGE(STATUS "Found no acceptable iconv library. This is fatal.") - message("iconv header: ${ICONV_INCLUDE_DIR}") - message("iconv lib : ${ICONV_LIBRARY}") - MESSAGE(FATAL_ERROR "Could NOT find iconv library") - ENDIF (ICONV_FIND_REQUIRED) -ENDIF (ICONV_FOUND) - -MARK_AS_ADVANCED(ICONV_LIBRARY ICONV_INCLUDE_DIR) + +if (ICONV_INCLUDE_DIR) + # Already in cache, be silent + set(ICONV_FIND_QUIETLY TRUE) +endif (ICONV_INCLUDE_DIR) + +FIND_PATH(ICONV_INCLUDE_DIR iconv.h + /usr/include + /usr/local/include +) + +set(POTENTIAL_ICONV_LIBS iconv libiconv) +FIND_LIBRARY(ICONV_LIBRARY NAMES ${POTENTIAL_ICONV_LIBS} +PATHS + /usr/lib + /usr/local/lib +) + +if(WIN32) + FIND_FILE(ICONV_DLL iconv.dll NO_DEFAULT_PATH ENV PATH) + FIND_FILE(ICONV_DLL_HELP iconv.dll) + IF(ICONV_FIND_REQUIRED) + IF(NOT ICONV_DLL AND NOT ICONV_DLL_HELP) + MESSAGE(FATAL_ERROR "Could not find iconv.dll, please add correct your PATH environment variable") + ENDIF(NOT ICONV_DLL AND NOT ICONV_DLL_HELP) + IF(NOT ICONV_DLL AND ICONV_DLL_HELP) + GET_FILENAME_COMPONENT(ICONV_DLL_HELP ${ICONV_DLL_HELP} PATH) + MESSAGE("Could not find iconv.dll in standard search path, please add ") + MESSAGE("${ICONV_DLL_HELP} to your PATH environment variable.") + MESSAGE(FATAL_ERROR) + ENDIF(NOT ICONV_DLL AND ICONV_DLL_HELP) + ENDIF(ICONV_FIND_REQUIRED) +ELSE(WIN32) + set(ICONV_DLL TRUE) +endif(WIN32) + + +IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY AND ICONV_DLL) + SET(ICONV_FOUND TRUE) +ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY AND ICONV_DLL) + +IF (ICONV_FOUND) + IF (NOT ICONV_FIND_QUIETLY) + MESSAGE(STATUS "Found iconv: ${ICONV_LIBRARY}") + ENDIF (NOT ICONV_FIND_QUIETLY) +ELSE (ICONV_FOUND) + IF (ICONV_FIND_REQUIRED) + MESSAGE(STATUS "Looked for iconv library named ${POTENTIAL_ICONV_LIBS}.") + MESSAGE(STATUS "Found no acceptable iconv library. This is fatal.") + message("iconv header: ${ICONV_INCLUDE_DIR}") + message("iconv lib : ${ICONV_LIBRARY}") + MESSAGE(FATAL_ERROR "Could NOT find iconv library") + ENDIF (ICONV_FIND_REQUIRED) +ENDIF (ICONV_FOUND) + +MARK_AS_ADVANCED(ICONV_LIBRARY ICONV_INCLUDE_DIR) diff --git a/development/cmake/modules/FindQt4.cmake b/development/cmake/modules/FindQt4.cmake old mode 100755 new mode 100644 diff --git a/development/cmake/modules/FindZLIB.cmake b/development/cmake/modules/FindZLIB.cmake old mode 100755 new mode 100644 index 4ebf5fa49e..8eef79d904 --- a/development/cmake/modules/FindZLIB.cmake +++ b/development/cmake/modules/FindZLIB.cmake @@ -1,34 +1,34 @@ -if (ZLIB_INCLUDE_DIR) - # Already in cache, be silent - set(ZLIB_FIND_QUIETLY TRUE) -endif (ZLIB_INCLUDE_DIR) - -FIND_PATH(ZLIB_INCLUDE_DIR zlib.h - /usr/include - /usr/local/include -) - -set(POTENTIAL_Z_LIBS z zlib zdll) -FIND_LIBRARY(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS} -PATHS - /usr/lib - /usr/local/lib -) - -IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) - SET(ZLIB_FOUND TRUE) -ENDIF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) - -IF (ZLIB_FOUND) - IF (NOT ZLIB_FIND_QUIETLY) - MESSAGE(STATUS "Found Z: ${ZLIB_LIBRARY}") - ENDIF (NOT ZLIB_FIND_QUIETLY) -ELSE (ZLIB_FOUND) - IF (ZLIB_FIND_REQUIRED) - MESSAGE(STATUS "Looked for Z libraries named ${POTENTIAL_Z_LIBS}.") - MESSAGE(STATUS "Found no acceptable Z library. This is fatal.") - MESSAGE(FATAL_ERROR "Could NOT find z library") - ENDIF (ZLIB_FIND_REQUIRED) -ENDIF (ZLIB_FOUND) - -MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) +if (ZLIB_INCLUDE_DIR) + # Already in cache, be silent + set(ZLIB_FIND_QUIETLY TRUE) +endif (ZLIB_INCLUDE_DIR) + +FIND_PATH(ZLIB_INCLUDE_DIR zlib.h + /usr/include + /usr/local/include +) + +set(POTENTIAL_Z_LIBS z zlib zdll) +FIND_LIBRARY(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS} +PATHS + /usr/lib + /usr/local/lib +) + +IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) + SET(ZLIB_FOUND TRUE) +ENDIF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) + +IF (ZLIB_FOUND) + IF (NOT ZLIB_FIND_QUIETLY) + MESSAGE(STATUS "Found Z: ${ZLIB_LIBRARY}") + ENDIF (NOT ZLIB_FIND_QUIETLY) +ELSE (ZLIB_FOUND) + IF (ZLIB_FIND_REQUIRED) + MESSAGE(STATUS "Looked for Z libraries named ${POTENTIAL_Z_LIBS}.") + MESSAGE(STATUS "Found no acceptable Z library. This is fatal.") + MESSAGE(FATAL_ERROR "Could NOT find z library") + ENDIF (ZLIB_FIND_REQUIRED) +ENDIF (ZLIB_FOUND) + +MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake old mode 100755 new mode 100644 diff --git a/development/cmake/modules/LyXPaths.cmake b/development/cmake/modules/LyXPaths.cmake old mode 100755 new mode 100644 index cd2517a049..ce8c1d89fa --- a/development/cmake/modules/LyXPaths.cmake +++ b/development/cmake/modules/LyXPaths.cmake @@ -1,49 +1,49 @@ -if(WIN32) - -file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path) - -set(_zlib_path ${_prog_path}/zlib) -set(_iconv_path ${_prog_path}/iconv) -set(_gnuwin32_dir ${_prog_path}/gnuwin32) - -set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} - ${_gnuwin32_dir}/include - ${_zlib_path}/include - ${_iconv_path}/include - ) - -set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} - ${_gnuwin32_dir}/lib - ${_zlib_path}/lib - ${_iconv_path}/lib - ) - -#chek_include_files path -set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${_gnuwin32_dir}/include) - - -else(WIN32) - - set(_prog_path ~/bin) - -endif(WIN32) - - -GET_FILENAME_COMPONENT(lyx_dir_readme ${CMAKE_SOURCE_DIR}/../../README ABSOLUTE) -GET_FILENAME_COMPONENT(TOP_SRC_DIR ${lyx_dir_readme} PATH) - -if(WIN32) - set(locale_dir Resources/locale) -else(WIN32) - set(locale_dir share/locale) -endif(WIN32) - -set(PREFIX ${_prog_path}/LyX) -set(LOCAL_DIR ${PREFIX}/${locale_dir}) - -#message(" PREFIX : ${PREFIX}") -#message(" LOCAL_DIR : ${LOCAL_DIR}") -#message(" TOP_SRC_DIR : ${TOP_SRC_DIR}") - - - +if(WIN32) + +file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _prog_path) + +set(_zlib_path ${_prog_path}/zlib) +set(_iconv_path ${_prog_path}/iconv) +set(_gnuwin32_dir ${_prog_path}/gnuwin32) + +set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} + ${_gnuwin32_dir}/include + ${_zlib_path}/include + ${_iconv_path}/include + ) + +set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} + ${_gnuwin32_dir}/lib + ${_zlib_path}/lib + ${_iconv_path}/lib + ) + +#chek_include_files path +set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${_gnuwin32_dir}/include) + + +else(WIN32) + + set(_prog_path ~/bin) + +endif(WIN32) + + +GET_FILENAME_COMPONENT(lyx_dir_readme ${CMAKE_SOURCE_DIR}/../../README ABSOLUTE) +GET_FILENAME_COMPONENT(TOP_SRC_DIR ${lyx_dir_readme} PATH) + +if(WIN32) + set(locale_dir Resources/locale) +else(WIN32) + set(locale_dir share/locale) +endif(WIN32) + +set(PREFIX ${_prog_path}/LyX) +set(LOCAL_DIR ${PREFIX}/${locale_dir}) + +#message(" PREFIX : ${PREFIX}") +#message(" LOCAL_DIR : ${LOCAL_DIR}") +#message(" TOP_SRC_DIR : ${TOP_SRC_DIR}") + + + diff --git a/development/cmake/modules/LyXuic.cmake b/development/cmake/modules/LyXuic.cmake old mode 100755 new mode 100644 diff --git a/development/cmake/modules/MacroAddFileDependencies.cmake b/development/cmake/modules/MacroAddFileDependencies.cmake old mode 100755 new mode 100644 diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt old mode 100755 new mode 100644 index d498e60d51..9e49df6c1f --- a/development/cmake/src/CMakeLists.txt +++ b/development/cmake/src/CMakeLists.txt @@ -265,5 +265,5 @@ target_link_libraries(lyx-qt4 ) if(ASPELL_FOUND) - target_link_libraries(lyx-qt4 ${ASPELL_LIBRARIES}) + target_link_libraries(lyx-qt4 ${ASPELL_LIBRARY}) endif(ASPELL_FOUND) diff --git a/development/cmake/src/dummy.cpp b/development/cmake/src/dummy.cpp old mode 100755 new mode 100644 index fb0a97b93b..5f37a17f60 --- a/development/cmake/src/dummy.cpp +++ b/development/cmake/src/dummy.cpp @@ -1 +1 @@ -//autogenerated file by cmake +//autogenerated file by cmake diff --git a/development/cmake/src/frontends/CMakeLists.txt b/development/cmake/src/frontends/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/development/cmake/src/frontends/controllers/CMakeLists.txt b/development/cmake/src/frontends/controllers/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/development/cmake/src/graphics/CMakeLists.txt b/development/cmake/src/graphics/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/development/cmake/src/insets/CMakeLists.txt b/development/cmake/src/insets/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/development/cmake/src/mathed/CMakeLists.txt b/development/cmake/src/mathed/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/development/cmake/src/support/CMakeLists.txt b/development/cmake/src/support/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/development/cmake/src/support/package.C.cmake b/development/cmake/src/support/package.C.cmake old mode 100755 new mode 100644 diff --git a/development/cmake/src/tex2lyx/CMakeLists.txt b/development/cmake/src/tex2lyx/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/development/cmake/src/version.C.cmake b/development/cmake/src/version.C.cmake old mode 100755 new mode 100644 -- 2.39.5