mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
Cmake build: Remove use of policies which will be deprecated in near future
In order to prevent unpleasant surprises later. (Cmake 3.8 already emits now warnings here.)
This commit is contained in:
parent
0f798d6675
commit
d74c43e7a3
@ -37,16 +37,8 @@ set(LYX_TESTS_USERDIR "${TOP_BINARY_DIR}/Testing/.lyx")
|
||||
file(MAKE_DIRECTORY "${LYX_TESTS_USERDIR}")
|
||||
|
||||
if(COMMAND cmake_policy)
|
||||
cmake_policy(SET CMP0003 OLD)
|
||||
cmake_policy(SET CMP0005 OLD)
|
||||
# Installing MACOSX_BUNDLE targets requires a BUNDLE DESTINATION
|
||||
cmake_policy(SET CMP0006 NEW)
|
||||
if(POLICY CMP0020)
|
||||
cmake_policy(SET CMP0020 OLD)
|
||||
endif()
|
||||
if(POLICY CMP0028)
|
||||
cmake_policy(SET CMP0028 OLD)
|
||||
endif()
|
||||
if(POLICY CMP0043)
|
||||
# COMPILE_DEFINITIONS are not used yet. Enable new behavior.
|
||||
cmake_policy(SET CMP0043 NEW)
|
||||
@ -797,7 +789,7 @@ else()
|
||||
if(NOT LYX_USE_STD_REGEX)
|
||||
set(Lyx_Boost_Libraries boost_regex)
|
||||
endif()
|
||||
add_definitions(-DBOOST_USER_CONFIG="<config.h>")
|
||||
add_definitions(-DBOOST_USER_CONFIG=<config.h>)
|
||||
include_directories(${TOP_SRC_DIR}/3rdparty/boost)
|
||||
add_subdirectory(3rdparty/boost "${TOP_BINARY_DIR}/3rdparty/boost")
|
||||
endif()
|
||||
|
Loading…
Reference in New Issue
Block a user