Skip to content

Commit

Permalink
Update CMake
Browse files Browse the repository at this point in the history
  • Loading branch information
Mizux committed Jul 1, 2020
1 parent 5d121af commit b7fb6d4
Show file tree
Hide file tree
Showing 9 changed files with 1,045 additions and 173 deletions.
232 changes: 232 additions & 0 deletions .cmake-format.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,232 @@
# ----------------------------------
# Options affecting listfile parsing
# ----------------------------------
with section("parse"):

# Specify structure for custom cmake functions
additional_commands = {
'foo': { 'flags': ['BAR', 'BAZ'],
'kwargs': {'DEPENDS': '*',
'HEADERS': '*',
'SOURCES': '*'}},
'build_git_dependency': { 'flags': [],
'kwargs': { 'NAME': '*',
'REPOSITORY': '*',
'TAG': '*',
'APPLY_PATCH': '*',
'CMAKE_ARGS': '*'}}
}

# Specify variable tags.
vartags = []

# Specify property tags.
proptags = []

# -----------------------------
# Options affecting formatting.
# -----------------------------
with section("format"):

# How wide to allow formatted cmake files
line_width = 80

# How many spaces to tab for indent
tab_size = 2

# If an argument group contains more than this many sub-groups (parg or kwarg
# groups) then force it to a vertical layout.
max_subgroups_hwrap = 2

# If a positional argument group contains more than this many arguments, then
# force it to a vertical layout.
max_pargs_hwrap = 6

# If a cmdline positional group consumes more than this many lines without
# nesting, then invalidate the layout (and nest)
max_rows_cmdline = 2

# If true, separate flow control names from their parentheses with a space
separate_ctrl_name_with_space = False

# If true, separate function names from parentheses with a space
separate_fn_name_with_space = False

# If a statement is wrapped to more than one line, than dangle the closing
# parenthesis on its own line.
dangle_parens = False

# If the trailing parenthesis must be 'dangled' on its on line, then align it
# to this reference: `prefix`: the start of the statement, `prefix-indent`:
# the start of the statement, plus one indentation level, `child`: align to
# the column of the arguments
dangle_align = 'prefix'

# If the statement spelling length (including space and parenthesis) is
# smaller than this amount, then force reject nested layouts.
min_prefix_chars = 4

# If the statement spelling length (including space and parenthesis) is larger
# than the tab width by more than this amount, then force reject un-nested
# layouts.
max_prefix_chars = 10

# If a candidate layout is wrapped horizontally but it exceeds this many
# lines, then reject the layout.
max_lines_hwrap = 2

# What style line endings to use in the output.
line_ending = 'unix'

# Format command names consistently as 'lower' or 'upper' case
command_case = 'canonical'

# Format keywords consistently as 'lower' or 'upper' case
keyword_case = 'unchanged'

# A list of command names which should always be wrapped
always_wrap = []

# If true, the argument lists which are known to be sortable will be sorted
# lexicographicall
enable_sort = True

# If true, the parsers may infer whether or not an argument list is sortable
# (without annotation).
autosort = False

# By default, if cmake-format cannot successfully fit everything into the
# desired linewidth it will apply the last, most agressive attempt that it
# made. If this flag is True, however, cmake-format will print error, exit
# with non-zero status code, and write-out nothing
require_valid_layout = False

# A dictionary mapping layout nodes to a list of wrap decisions. See the
# documentation for more information.
layout_passes = {}

# ------------------------------------------------
# Options affecting comment reflow and formatting.
# ------------------------------------------------
with section("markup"):

# What character to use for bulleted lists
bullet_char = '*'

# What character to use as punctuation after numerals in an enumerated list
enum_char = '.'

# If comment markup is enabled, don't reflow the first comment block in each
# listfile. Use this to preserve formatting of your copyright/license
# statements.
first_comment_is_literal = False

# If comment markup is enabled, don't reflow any comment block which matches
# this (regex) pattern. Default is `None` (disabled).
literal_comment_pattern = None

# Regular expression to match preformat fences in comments default=
# ``r'^\s*([`~]{3}[`~]*)(.*)$'``
fence_pattern = '^\\s*([`~]{3}[`~]*)(.*)$'

# Regular expression to match rulers in comments default=
# ``r'^\s*[^\w\s]{3}.*[^\w\s]{3}$'``
ruler_pattern = '^\\s*[^\\w\\s]{3}.*[^\\w\\s]{3}$'

# If a comment line matches starts with this pattern then it is explicitly a
# trailing comment for the preceeding argument. Default is '#<'
explicit_trailing_pattern = '#<'

# If a comment line starts with at least this many consecutive hash
# characters, then don't lstrip() them off. This allows for lazy hash rulers
# where the first hash char is not separated by space
hashruler_min_length = 10

# If true, then insert a space between the first hash char and remaining hash
# chars in a hash ruler, and normalize its length to fill the column
canonicalize_hashrulers = True

# enable comment markup parsing and reflow
enable_markup = True

# ----------------------------
# Options affecting the linter
# ----------------------------
with section("lint"):

# a list of lint codes to disable
disabled_codes = []

# regular expression pattern describing valid function names
function_pattern = '[0-9a-z_]+'

# regular expression pattern describing valid macro names
macro_pattern = '[0-9A-Z_]+'

# regular expression pattern describing valid names for variables with global
# (cache) scope
global_var_pattern = '[A-Z][0-9A-Z_]+'

# regular expression pattern describing valid names for variables with global
# scope (but internal semantic)
internal_var_pattern = '_[A-Z][0-9A-Z_]+'

# regular expression pattern describing valid names for variables with local
# scope
local_var_pattern = '[a-z][a-z0-9_]+'

# regular expression pattern describing valid names for privatedirectory
# variables
private_var_pattern = '_[0-9a-z_]+'

# regular expression pattern describing valid names for public directory
# variables
public_var_pattern = '[A-Z][0-9A-Z_]+'

# regular expression pattern describing valid names for function/macro
# arguments and loop variables.
argument_var_pattern = '[a-z][a-z0-9_]+'

# regular expression pattern describing valid names for keywords used in
# functions or macros
keyword_pattern = '[A-Z][0-9A-Z_]+'

# In the heuristic for C0201, how many conditionals to match within a loop in
# before considering the loop a parser.
max_conditionals_custom_parser = 2

# Require at least this many newlines between statements
min_statement_spacing = 1

# Require no more than this many newlines between statements
max_statement_spacing = 2
max_returns = 6
max_branches = 12
max_arguments = 5
max_localvars = 15
max_statements = 50

# -------------------------------
# Options affecting file encoding
# -------------------------------
with section("encode"):

# If true, emit the unicode byte-order mark (BOM) at the start of the file
emit_byteorder_mark = False

# Specify the encoding of the input file. Defaults to utf-8
input_encoding = 'utf-8'

# Specify the encoding of the output file. Defaults to utf-8. Note that cmake
# only claims to support utf-8 so be careful when using anything else
output_encoding = 'utf-8'

# -------------------------------------
# Miscellaneous configurations options.
# -------------------------------------
with section("misc"):

# A dictionary containing any per-command configuration overrides. Currently
# only `command_case` is supported.
per_command = {}

4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ CMAKE_DEPENDENT_OPTION(BUILD_ZLIB "Build the ZLIB dependency Library" OFF
"NOT BUILD_DEPS" ON)
message(STATUS "Build ZLIB: ${BUILD_ZLIB}")

CMAKE_DEPENDENT_OPTION(BUILD_SCIP "Build the SCIP dependency Library" OFF
"NOT BUILD_DEPS" ON)
message(STATUS "Build SCIP: ${BUILD_SCIP}")

CMAKE_DEPENDENT_OPTION(BUILD_absl "Build the abseil-cpp dependency Library" OFF
"NOT BUILD_DEPS" ON)
message(STATUS "Build abseil-cpp: ${BUILD_absl}")
Expand Down
55 changes: 21 additions & 34 deletions cmake/cpp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,11 @@ find_package(Threads REQUIRED)
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)

# libprotobuf force us to depends on ZLIB::ZLIB target
if(BUILD_ZLIB)
find_package(ZLIB REQUIRED CONFIG)
else()
if(NOT BUILD_ZLIB)
find_package(ZLIB REQUIRED)
endif()

if(BUILD_absl)
find_package(absl REQUIRED CONFIG)
else()
if(NOT BUILD_absl)
find_package(absl REQUIRED)
endif()
set(ABSL_DEPS
Expand All @@ -40,54 +36,44 @@ set(ABSL_DEPS
)

set(GFLAGS_USE_TARGET_NAMESPACE TRUE)
if(BUILD_gflags)
find_package(gflags REQUIRED CONFIG)
set(GFLAGS_DEP gflags::gflags_static)
else()
if(NOT BUILD_gflags)
find_package(gflags REQUIRED)
set(GFLAGS_DEP gflags::gflags)
endif()

if(BUILD_glog)
find_package(glog REQUIRED CONFIG)
else()
if(NOT BUILD_glog)
find_package(glog REQUIRED)
endif()

if(BUILD_Protobuf)
find_package(Protobuf REQUIRED CONFIG)
else()
if(NOT BUILD_Protobuf)
find_package(Protobuf REQUIRED)
else()
if(${CMAKE_VERSION} VERSION_LESS "3.18")
find_package(Protobuf REQUIRED CONFIG)
endif()

if(NOT TARGET protobuf::libprotobuf)
message(FATAL_ERROR "protobuf not builded")
endif()
endif()

if(USE_COINOR)
if(BUILD_CoinUtils)
find_package(CoinUtils REQUIRED CONFIG)
else()
if(NOT BUILD_CoinUtils)
find_package(CoinUtils REQUIRED)
endif()

if(BUILD_Osi)
find_package(Osi REQUIRED CONFIG)
else()
if(NOT BUILD_Osi)
find_package(Osi REQUIRED)
endif()

if(BUILD_Clp)
find_package(Clp REQUIRED CONFIG)
else()
if(NOT BUILD_Clp)
find_package(Clp REQUIRED)
endif()

if(BUILD_Cgl)
find_package(Cgl REQUIRED CONFIG)
else()
if(NOT BUILD_Cgl)
find_package(Cgl REQUIRED)
endif()

if(BUILD_Cbc)
find_package(Cbc REQUIRED CONFIG)
else()
if(NOT BUILD_Cbc)
find_package(Cbc REQUIRED)
endif()

Expand Down Expand Up @@ -224,7 +210,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
${CMAKE_DL_LIBS}
ZLIB::ZLIB
${ABSL_DEPS}
${GFLAGS_DEP}
gflags::gflags
glog::glog
protobuf::libprotobuf
${COINOR_DEPS}
Expand Down Expand Up @@ -254,10 +240,11 @@ file(GLOB_RECURSE proto_files RELATIVE ${PROJECT_SOURCE_DIR}
"ortools/linear_solver/*.proto"
)

# Get Protobuf include dir
## Get Protobuf include dir
get_target_property(protobuf_dirs protobuf::libprotobuf INTERFACE_INCLUDE_DIRECTORIES)
foreach(dir IN LISTS protobuf_dirs)
if ("${dir}" MATCHES "BUILD_INTERFACE")
message(STATUS "Adding proto path: ${dir}")
list(APPEND PROTO_DIRS "\"--proto_path=${dir}\"")
endif()
endforeach()
Expand Down
Loading

1 comment on commit b7fb6d4

@Neustradamus
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Mizux: Now there is zlib 1.2.13 with CVE fixes.

Please sign in to comment.