cmake: move remaining ungrounded entries into LYX_ group

[features.git] / development / cmake / CMakeLists.txt

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index bf8f1a74f197b3bfae786e591ee3665618242fdb..65d1a9a13b149c91250c2418b60e39ec737e8ee2 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -43,6 +43,7 @@ LYX_OPTION(PACKAGE_SUFFIX "Use version suffix for packaging" ON ALL)
 LYX_OPTION(PROGRAM_SUFFIX "Append version suffix to binaries" ON GCC)
 LYX_OPTION(NO_CONSOLE "Suppress console on Windows" OFF MSVC)
 LYX_OPTION(VLD "Use VLD with MSVC" OFF MSVC)
+LYX_OPTION(WALL "Enable all warnings" OFF MSVC)
 LYX_OPTION(DISABLE_PCH "Disable precompiled headers" ON ALL)
 LYX_OPTION(MERGE_FILES "Merge source files into one compilation unit" OFF ALL)
 LYX_OPTION(DEBUG_GLIBC "Enable libstdc++ debug mode" OFF GCC)
@@ -80,7 +81,7 @@ if(LYX_INSTALL)
        set(LYX_ASPELL ON CACHE BOOL "Aspell option" FORCE)
        set(LYX_NLS ON CACHE BOOL "Nls option" FORCE)
        SET(LYX_NO_CONSOLE ON CACHE BOOL "No console option" FORCE)
-       SET(PACKAGE_SUFFIX ON CACHE BOOL "Package suffix option" FORCE)
+       SET(LYX_PACKAGE_SUFFIX ON CACHE BOOL "Package suffix option" FORCE)
        SET(LYX_RELEASE ON CACHE BOOL "Release option" FORCE)
        SET(LYX_DEBUG OFF CACHE BOOL "Debug option" FORCE)
        SET(LYX_PROFILE OFF CACHE BOOL "Profile option" FORCE)
@@ -164,14 +165,14 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 
 if (WIN32)
-  set(DATA_SUBDIR "Resources/" CACHE STRING "Subdirectory for all lyx-system-data" FORCE)
+  set(LYX_DATA_SUBDIR "Resources/" CACHE STRING "Subdirectory for all lyx-system-data" FORCE)
 else()
-  set(DATA_SUBDIR "" CACHE STRING "Subdirectory for all lyx-system-data" FORCE)
+  set(LYX_DATA_SUBDIR "" CACHE STRING "Subdirectory for all lyx-system-data" FORCE)
 endif()
 
 set(LYX_ABS_INSTALLED_DATADIR "${CMAKE_INSTALL_PREFIX}")
 set(LYX_LOCALEDIR "locale")
-set(LYX_ABS_INSTALLED_LOCALEDIR "${LYX_ABS_INSTALLED_DATADIR}/${DATA_SUBDIR}${LYX_LOCALEDIR}")
+set(LYX_ABS_INSTALLED_LOCALEDIR "${LYX_ABS_INSTALLED_DATADIR}/${LYX_DATA_SUBDIR}${LYX_LOCALEDIR}")
 set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}")
 
 
@@ -375,9 +376,7 @@ if(MSVC)
        endif()
 
         # TODO options
-       if(WALL)
-               set(WALL 1 CACHE TYPE STRING FORCE)
-
+       if(LYX_WALL)
                # Use the highest warning level
                set(CMAKE_CXX_WARNING_LEVEL 4 CACHE TYPE STRING FORCE)
                set(WARNING_LEVEL_MESSAGE "(switch to warning level 3 with -DWALL=0)")
@@ -407,8 +406,6 @@ if(MSVC)
                        "${CMAKE_CXX_FLAGS_MINSIZEREL} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
 
        else()
-               set(WALL 0 CACHE TYPE STRING FORCE)
-
                set(CMAKE_CXX_WARNING_LEVEL 3 CACHE TYPE STRING FORCE)
                set(WARNING_LEVEL_MESSAGE "(switch to warning level 4 with -DWALL=1)")
 
@@ -439,9 +436,8 @@ if(MSVC)
 
 endif()
 
-FIND_PROGRAM(_PERL_EXECUTABLE perl)
-FIND_PROGRAM(_PYTHON_EXECUTABLE python)
-if( NOT ${_PYTHON_EXECUTABLE} MATCHES "-NOTFOUND")
+FIND_PROGRAM(LYX_PYTHON_EXECUTABLE python)
+if( NOT ${LYX_PYTHON_EXECUTABLE} MATCHES "-NOTFOUND")
     if(LYX_NLS)
       find_package(LyXGettext REQUIRED)
       include_directories(${TOP_SRC_DIR}/po)
@@ -505,7 +501,8 @@ add_subdirectory(src)
 
 if(LYX_INSTALL)
        add_subdirectory(man)
-       if(NOT ${_PERL_EXECUTABLE} MATCHES "-NOTFOUND")
+       FIND_PROGRAM(LYX_PERL_EXECUTABLE python)
+       if(NOT ${LYX_PERL_EXECUTABLE} MATCHES "-NOTFOUND")
                add_subdirectory(doc)
        endif()
 endif()