To have options in a group I wolud like to add a prefix to options for cmake-build.
lyxinstall -> LYX_install
UseExternalBoost -> LYX_UseExternalBoost
disable-pch -> LYX_disable-pch
Peter, Joost, do you mind to accept following? (trunk)
Kornel
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (Revision 34761)
+++ CMakeLists.txt (Arbeitskopie)
@@ -24,7 +24,7 @@
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
-option(lyxinstall "Build install projects/rules" ON)
+option(LYX_install "Build install projects/rules" ON)
if(UNIX OR MINGW)
@@ -156,7 +156,7 @@
endif()
-set(CMAKE_BUILD_TYPE Release)
+set(CMAKE_BUILD_TYPE Debug)
if(profile)
set(CMAKE_BUILD_TYPE Profile CACHE TYPE STRING FORCE)
@@ -315,15 +315,15 @@
# Not sure if it works for all non-msvc compilers
include(PCHSupport_26)
if (MSVC)
- option(disable-pch "Disable precompiled headers" ON)
+ option(LYX_disable-pch "Disable precompiled headers" ON)
else()
- option(disable-pch "Disable precompiled headers" ON)
+ option(LYX_disable-pch "Disable precompiled headers" ON)
endif()
-if(NOT disable-pch)
+if(NOT LYX_disable-pch)
message(STATUS "-----")
- message(STATUS "----- using precompiled headers, disable with -Ddisable-pch=1")
+ message(STATUS "----- using precompiled headers, disable with -DLYX_disable-pch=1")
message(STATUS "-----")
configure_file(${CMAKE_SOURCE_DIR}/pcheaders.h ${CMAKE_BINARY_DIR}/pcheaders.h)
configure_file(${CMAKE_SOURCE_DIR}/config.cpp.cmake ${CMAKE_BINARY_DIR}/config_pch.cpp)
@@ -354,10 +354,10 @@
else()
if(MSVC)
message(STATUS "-----")
- message(STATUS "----- precompiled headers disabled, enable with -Ddisable-pch=0")
+ message(STATUS "----- precompiled headers disabled, enable with -DLYX_disable-pch=0")
message(STATUS "-----")
endif()
- set(disable-pch TRUE CACHE TYPE STRING)
+ set(LYX_disable-pch TRUE CACHE TYPE STRING)
macro(lyx_add_msvc_pch)
endmacro(lyx_add_msvc_pch)
macro(lyx_add_gcc_pch name_)
@@ -485,8 +485,8 @@
${CMAKE_BINARY_DIR}
${TOP_SRC_DIR}/src)
-option(UseExternalBoost "Use external boost" OFF)
-if(UseExternalBoost)
+option(LYX_UseExternalBoost "Use external boost" OFF)
+if(LYX_UseExternalBoost)
message(STATUS "Searching for boost")
find_package(Boost COMPONENTS signals regex)
if(Boost_FOUND)
@@ -497,7 +497,7 @@
message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
endif()
else()
- message(STATUS "----- Using internal boost. To build with installed version use -DUseExternalBoost:BOOL=ON")
+ message(STATUS "----- Using internal boost. To build with installed version use -DLYX_UseExternalBoost:BOOL=ON")
if(LYX_USE_TR1_REGEX)
set(Lyx_Boost_Libraries boost_signals)
else()
@@ -514,7 +514,7 @@
endif()
add_subdirectory(src)
-if(lyxinstall)
+if(LYX_install)
add_subdirectory(man)
if(NOT ${_PERL_EXECUTABLE} MATCHES "-NOTFOUND")
add_subdirectory(doc)
@@ -523,7 +523,7 @@
add_subdirectory(lyx2lyx)
add_subdirectory(scripts)
-if(lyxinstall)
+if(LYX_install)
include(../Install)
endif()
@@ -570,7 +570,7 @@
# so we do not provide infofiles for
# CPACK_RESOURCE_FILE_README and CPACK_RESOURCE_FILE_WELCOME
-if(lyxinstall)
+if(LYX_install)
include(CPack)
endif()
signature.asc
Description: This is a digitally signed message part.
