In colaboration with Stephan Witt, adapted to our libintl to MAC

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1c0ade673986ed87fbdca2bb3690023f951ff0d..61a727affa575d11e71fc96aa1b181c205370ff6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,36 +50,36 @@ include(LyXMacros)
 LYX_OPTION_INIT()
 
 # Options for all compilers/systems
-LYX_OPTION(CPACK "Use the CPack management (Implies LYX_INSTALL option)" OFF ALL)
-LYX_OPTION(INSTALL "Build install projects/rules (implies a bunch of other options)" OFF ALL)
-LYX_OPTION(NLS "Use nls" OFF ALL)
-LYX_OPTION(ASPELL "Require aspell" OFF ALL)
-LYX_OPTION(ENCHANT "Require Enchant" OFF ALL)
-LYX_OPTION(HUNSPELL "Require Hunspell" OFF ALL)
-LYX_OPTION(DEVEL_VERSION "Build developer version" OFF ALL) 
-LYX_OPTION(RELEASE "Build release version, build debug when disabled" ON ALL)
-LYX_OPTION(PACKAGE_SUFFIX "Use version suffix for packaging" ON ALL)
-LYX_OPTION(PCH "Use precompiled headers" OFF ALL)
-LYX_OPTION(MERGE_FILES "Merge source files into one compilation unit" OFF ALL)
-LYX_OPTION(MERGE_REBUILD "Rebuild generated files from merged files build" OFF ALL)
-LYX_OPTION(QUIET "Don't generate verbose makefiles" OFF ALL)
-LYX_OPTION(INSTALL_PREFIX "Install path for LyX" OFF ALL)
+LYX_OPTION(CPACK            "Use the CPack management (Implies LYX_INSTALL option)" OFF ALL)
+LYX_OPTION(INSTALL          "Build install projects/rules (implies a bunch of other options)" OFF ALL)
+LYX_OPTION(NLS              "Use nls" ON ALL)
+LYX_OPTION(ASPELL           "Require aspell" OFF ALL)
+LYX_OPTION(ENCHANT          "Require Enchant" OFF ALL)
+LYX_OPTION(HUNSPELL         "Require Hunspell" OFF ALL)
+LYX_OPTION(DEVEL_VERSION    "Build developer version" OFF ALL) 
+LYX_OPTION(RELEASE          "Build release version, build debug when disabled" OFF ALL)
+LYX_OPTION(PACKAGE_SUFFIX   "Use version suffix for packaging" ON ALL)
+LYX_OPTION(PCH              "Use precompiled headers" OFF ALL)
+LYX_OPTION(MERGE_FILES      "Merge source files into one compilation unit" OFF ALL)
+LYX_OPTION(MERGE_REBUILD    "Rebuild generated files from merged files build" OFF ALL)
+LYX_OPTION(QUIET            "Don't generate verbose makefiles" OFF ALL)
+LYX_OPTION(INSTALL_PREFIX   "Install path for LyX" OFF ALL)
 LYX_OPTION(EXTERNAL_LIBINTL "Use external libintl" ON ALL)
 
 # GCC specific
-LYX_OPTION(PROFILE "Build profile version" OFF GCC)
-LYX_OPTION(EXTERNAL_BOOST "Use external boost" OFF GCC)
-LYX_OPTION(PROGRAM_SUFFIX "Append version suffix to binaries" ON GCC)
-LYX_OPTION(DEBUG_GLIBC "Enable libstdc++ debug mode" OFF GCC)
+LYX_OPTION(PROFILE              "Build profile version" OFF GCC)
+LYX_OPTION(EXTERNAL_BOOST       "Use external boost" OFF GCC)
+LYX_OPTION(PROGRAM_SUFFIX       "Append version suffix to binaries" ON GCC)
+LYX_OPTION(DEBUG_GLIBC          "Enable libstdc++ debug mode" OFF GCC)
 LYX_OPTION(DEBUG_GLIBC_PEDANTIC "Enable libstdc++pedantic debug mode" OFF GCC)
-LYX_OPTION(STDLIB_DEBUG "Use debug stdlib" OFF GCC)
-LYX_OPTION(CONCEPT_CHECKS "Enable concept-checks" OFF GCC)
+LYX_OPTION(STDLIB_DEBUG         "Use debug stdlib" OFF GCC)
+LYX_OPTION(CONCEPT_CHECKS       "Enable concept-checks" OFF GCC)
 
 # MSVC specific
-LYX_OPTION(CONSOLE "Show console on Windows" ON MSVC)
-LYX_OPTION(VLD "Use VLD with MSVC" OFF MSVC)
-LYX_OPTION(WALL "Enable all warnings" OFF MSVC)
-LYX_OPTION(CONFIGURE_CHECKS "Also run configure checks for MSVC" OFF MSVC)
+LYX_OPTION(CONSOLE               "Show console on Windows" ON MSVC)
+LYX_OPTION(VLD                   "Use VLD with MSVC" OFF MSVC)
+LYX_OPTION(WALL                  "Enable all warnings" OFF MSVC)
+LYX_OPTION(CONFIGURE_CHECKS      "Also run configure checks for MSVC" OFF MSVC)
 LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC)
 
 # Check option dependencies
@@ -320,7 +320,7 @@ if(LYX_NLS)
        endif()
        find_package(LyXGettext REQUIRED)
        include_directories(${TOP_SRC_DIR}/po)
-       add_subdirectory(${LYX_CMAKE_DIR}/po "${TOP_BINARY_DIR}/po")
+       add_subdirectory(po "${TOP_BINARY_DIR}/po")
 endif()
 
 if(LYX_EXTERNAL_LIBINTL)
@@ -328,7 +328,7 @@ if(LYX_EXTERNAL_LIBINTL)
        add_definitions(-DHAVE_GETTEXT) #TODO move to config.h
 else()
        if(LYX_NLS)
-               add_subdirectory(${LYX_CMAKE_DIR}/intl "${TOP_BINARY_DIR}/intl")
+               add_subdirectory(intl "${TOP_BINARY_DIR}/intl")
        else()
                # do not compile if nls disabled
        endif()
@@ -352,7 +352,7 @@ else()
        endif()
        add_definitions(-DBOOST_USER_CONFIG="<config.h>")
        include_directories(${TOP_SRC_DIR}/boost)
-       add_subdirectory(${LYX_CMAKE_DIR}/boost "${TOP_BINARY_DIR}/boost")
+       add_subdirectory(boost "${TOP_BINARY_DIR}/boost")
 endif()
 
 
@@ -499,9 +499,9 @@ endif()
 configure_file(${LYX_CMAKE_DIR}/config.h.cmake ${TOP_BINARY_DIR}/config.h)
 
 
-add_subdirectory(${LYX_CMAKE_DIR}/src "${TOP_BINARY_DIR}/src")
-add_subdirectory(${LYX_CMAKE_DIR}/lyx2lyx "${TOP_BINARY_DIR}/lyx2lyx")
-add_subdirectory(${LYX_CMAKE_DIR}/scripts "${TOP_BINARY_DIR}/scripts")
+add_subdirectory(src "${TOP_BINARY_DIR}/src")
+add_subdirectory(lib/lyx2lyx "${TOP_BINARY_DIR}/lyx2lyx")
+add_subdirectory(lib/scripts "${TOP_BINARY_DIR}/scripts")
 
 
 if(LYX_INSTALL)