cmake: minor cleanups (indentation and typos)
This commit is contained in:
parent
799e8b241f
commit
475fe209a8
|
@ -46,14 +46,14 @@ endfunction ()
|
||||||
set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
|
set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
|
||||||
|
|
||||||
if (NOT DEFINED ENV{DEVELOPER_LOCAL_TOOLS})
|
if (NOT DEFINED ENV{DEVELOPER_LOCAL_TOOLS})
|
||||||
message(STATUS "Could not find DEVELOPER_LOCAL_TOOLS in env (not required)")
|
message(STATUS "Could not find DEVELOPER_LOCAL_TOOLS in env (not required)")
|
||||||
set(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT OFF)
|
set(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT OFF)
|
||||||
elseif (ENV{DEVELOPER_LOCAL_TOOLS} EQUAL 1)
|
elseif (ENV{DEVELOPER_LOCAL_TOOLS} EQUAL 1)
|
||||||
message(STATUS "Found: env DEVELOPER_LOCAL_TOOLS = 1")
|
message(STATUS "Found: env DEVELOPER_LOCAL_TOOLS = 1")
|
||||||
set(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT ON)
|
set(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT ON)
|
||||||
else()
|
else()
|
||||||
message(STATUS "found: env DEVELOPER_LOCAL_TOOLS = 0")
|
message(STATUS "Found: env DEVELOPER_LOCAL_TOOLS = 0")
|
||||||
set(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT OFF)
|
set(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT OFF)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
message(STATUS "BOOST_IGNORE_SYSTEM_PATHS defaults to ${BOOST_IGNORE_SYSTEM_PATHS_DEFAULT}")
|
message(STATUS "BOOST_IGNORE_SYSTEM_PATHS defaults to ${BOOST_IGNORE_SYSTEM_PATHS_DEFAULT}")
|
||||||
|
@ -92,13 +92,13 @@ else()
|
||||||
endif()
|
endif()
|
||||||
option(STATIC "Link libraries statically" ${DEFAULT_STATIC})
|
option(STATIC "Link libraries statically" ${DEFAULT_STATIC})
|
||||||
|
|
||||||
IF(STATIC)
|
if(STATIC)
|
||||||
IF(MSVC)
|
if(MSVC)
|
||||||
SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll.a .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll.a .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
||||||
ELSE()
|
else()
|
||||||
SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
||||||
ENDIF()
|
endif()
|
||||||
ENDIF()
|
endif()
|
||||||
|
|
||||||
if (UNIX AND NOT APPLE)
|
if (UNIX AND NOT APPLE)
|
||||||
# Note that at the time of this writing the -Wstrict-prototypes flag added below will make this fail
|
# Note that at the time of this writing the -Wstrict-prototypes flag added below will make this fail
|
||||||
|
@ -175,7 +175,7 @@ else()
|
||||||
|
|
||||||
# There is a clang bug that does not allow to compile code that uses AES-NI intrinsics if -flto is enabled, so explicitly disable
|
# There is a clang bug that does not allow to compile code that uses AES-NI intrinsics if -flto is enabled, so explicitly disable
|
||||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||||
set(USE_LTO false)
|
set(USE_LTO false)
|
||||||
endif()
|
endif()
|
||||||
if(USE_LTO)
|
if(USE_LTO)
|
||||||
set(RELEASE_FLAGS "${RELEASE_FLAGS} -flto")
|
set(RELEASE_FLAGS "${RELEASE_FLAGS} -flto")
|
||||||
|
@ -199,7 +199,7 @@ else()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (BOOST_IGNORE_SYSTEM_PATHS)
|
if (BOOST_IGNORE_SYSTEM_PATHS)
|
||||||
set(Boost_NO_SYSTEM_PATHS TRUE)
|
set(Boost_NO_SYSTEM_PATHS TRUE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(STATIC)
|
if(STATIC)
|
||||||
|
|
Loading…
Reference in New Issue