cmake: Move helper functions to cmake/Helpers.cmake.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b8b1665c8cc037f2afa10baae44915749a0fba2..2ea420431adf72e4fe9ff31c41037d57cef38973 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,156 +49,8 @@ set(CMAKE_C_STANDARD 99)
 set(CMAKE_CXX_STANDARD 11)
 
 #-----------------------------------------------------------------------------#
-# Macros
 
-include(CheckCCompilerFlag)
-include(CheckCXXCompilerFlag)
-
-macro(add_c_flag flag)
-  if(CMAKE_C_FLAGS)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}")
-  else()
-    set(CMAKE_C_FLAGS "${flag}")
-  endif()
-  message(STATUS "Configuring with C flag '${flag}'")
-endmacro()
-
-macro(add_cxx_flag flag)
-  if(CMAKE_CXX_FLAGS)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-  else()
-    set(CMAKE_CXX_FLAGS "${flag}")
-  endif()
-  message(STATUS "Configuring with CXX flag '${flag}'")
-endmacro()
-
-macro(add_c_cxx_flag flag)
-  add_c_flag(${flag})
-  add_cxx_flag(${flag})
-endmacro()
-
-macro(add_check_c_flag flag)
-  string(REGEX REPLACE "[-=]" "_" flagname ${flag})
-  check_c_compiler_flag("${flag}" HAVE_FLAG${flagname})
-  if(HAVE_FLAG${flagname})
-    add_c_flag(${flag})
-  endif()
-endmacro()
-
-macro(add_check_cxx_flag flag)
-  string(REGEX REPLACE "[-=]" "_" flagname ${flag})
-  check_cxx_compiler_flag("${flag}" HAVE_FLAG${flagname})
-  if(HAVE_FLAG${flagname})
-    add_cxx_flag(${flag})
-  endif()
-endmacro()
-
-macro(add_check_c_cxx_flag flag)
-  add_check_c_flag(${flag})
-  add_check_cxx_flag(${flag})
-endmacro()
-
-macro(add_required_cxx_flag flag)
-  string(REGEX REPLACE "[-=]" "_" flagnamename ${flag})
-  check_cxx_compiler_flag("${flag}" HAVE_FLAG${flagname})
-  if (NOT HAVE_FLAG${flagname})
-    message(FATAL_ERROR "Required compiler flag ${flag} not supported")
-  endif()
-  add_cxx_flag(${flag})
-endmacro()
-
-macro(add_required_c_flag flag)
-  string(REGEX REPLACE "[-=]" "_" flagname ${flag})
-  check_c_compiler_flag("${flag}" HAVE_FLAG${flagname})
-  if (NOT HAVE_FLAG${flagname})
-    message(FATAL_ERROR "Required compiler flag ${flag} not supported")
-  endif()
-  add_c_flag(${flag})
-endmacro()
-
-macro(add_required_c_cxx_flag flag)
-  add_required_c_flag(${flag})
-  add_required_cxx_flag(${flag})
-endmacro()
-
-# CVC4 Boolean options are three-valued to detect if an option was set by the
-# user. The available values are: IGNORE (default), ON, OFF
-# Default options do not override options that were set by the user, i.e.,
-# cvc4_set_option only sets an option if it's value is still IGNORE.
-# This e.g., allows the user to disable proofs for debug builds (where proofs
-# are enabled by default).
-macro(cvc4_option var description)
-  set(${var} IGNORE CACHE STRING "${description}")
-  # Provide drop down menu options in cmake-gui
-  set_property(CACHE ${var} PROPERTY STRINGS IGNORE ON OFF)
-endmacro()
-
-# Only set option if the user did not set an option.
-macro(cvc4_set_option var value)
-  if(${var} STREQUAL "IGNORE")
-    set(${var} ${value})
-  endif()
-endmacro()
-
-# Prepend 'prepand_value' to each element of the list 'in_list'. The result
-# is stored in 'out_list'.
-function(list_prepend in_list prepand_value out_list)
-  foreach(_elem ${${in_list}})
-    list(APPEND ${out_list} "${prepand_value}${_elem}")
-  endforeach()
-  set(${out_list} ${${out_list}} PARENT_SCOPE)
-endfunction()
-
-#-----------------------------------------------------------------------------#
-# libcvc4 macros
-
-# Collect all libraries that must be linked against libcvc4. These will be
-# actually linked in src/CMakeLists.txt with target_link_libaries(...).
-macro(libcvc4_link_libraries library)
-  set(LIBCVC4_LIBRARIES ${LIBCVC4_LIBRARIES} ${library})
-endmacro()
-
-# Collect all include directories that are required for libcvc4. These will be
-# actually included in src/CMakeLists.txt with target_include_directories(...).
-macro(libcvc4_include_directories dirs)
-  set(LIBCVC4_INCLUDES ${LIBCVC4_INCLUDES} ${dirs})
-endmacro()
-
-# Collect all source files that are required to build libcvc4 in LIBCVC4_SRCS
-# or LIBCVC4_GEN_SRCS. If GENERATED is the first argument the sources are
-# added to LIBCVC4_GEN_SRCS. All sources are prepended with the absolute
-# current path path. CMAKE_CURRENT_BINARY_DIR is prepended
-# to generated source files.
-macro(libcvc4_add_sources)
-  set(_sources ${ARGV})
-
-  # Check if the first argument is GENERATED.
-  list(GET _sources 0 _generated)
-  if(${_generated} STREQUAL "GENERATED")
-    list(REMOVE_AT _sources 0)
-    set(_cur_path ${CMAKE_CURRENT_BINARY_DIR})
-    set(_append_to LIBCVC4_GEN_SRCS)
-  else()
-    set(_cur_path ${CMAKE_CURRENT_SOURCE_DIR})
-    set(_append_to LIBCVC4_SRCS)
-  endif()
-
-  # Prepend source files with current path.
-  foreach(_src ${_sources})
-    list(APPEND ${_append_to} "${_cur_path}/${_src}")
-  endforeach()
-
-  file(RELATIVE_PATH
-       _rel_path "${PROJECT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}")
-
-  # Make changes to list ${_append_to} visible to the parent scope if not
-  # called from src/.
-  # Note: ${_append_to} refers to the variable name whereas ${${_append_to}}
-  # refers to the contents of the variable.
-  if(_rel_path)
-    set(${_append_to} ${${_append_to}} PARENT_SCOPE)
-  endif()
-endmacro()
+include(Helpers)
 
 #-----------------------------------------------------------------------------#
 # User options
@@ -596,19 +448,6 @@ endif()
 #-----------------------------------------------------------------------------#
 # Print build configuration
 
-# Helper to print the configuration of a 2-valued or 3-valued option 'var'
-# with prefix 'str'.
-macro(print_config str var)
-  if(${var} STREQUAL "ON")
-    set(OPT_VAL_STR "on")
-  elseif(${var} STREQUAL "OFF")
-    set(OPT_VAL_STR "off")
-  elseif(${var} STREQUAL "IGNORE")
-    set(OPT_VAL_STR "default")
-  endif()
-  message("${str} ${OPT_VAL_STR}")
-endmacro()
-
 # Convert build type to lower case.
 string(TOLOWER ${CMAKE_BUILD_TYPE} CVC4_BUILD_PROFILE_STRING)
 

diff --git a/cmake/Helpers.cmake b/cmake/Helpers.cmake
new file mode 100644 (file)
index 0000000..1dc59da
--- /dev/null
+++ b/cmake/Helpers.cmake
@@ -0,0 +1,162 @@
+include(CheckCCompilerFlag)
+include(CheckCXXCompilerFlag)
+
+macro(add_c_flag flag)
+  if(CMAKE_C_FLAGS)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}")
+  else()
+    set(CMAKE_C_FLAGS "${flag}")
+  endif()
+  message(STATUS "Configuring with C flag '${flag}'")
+endmacro()
+
+macro(add_cxx_flag flag)
+  if(CMAKE_CXX_FLAGS)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+  else()
+    set(CMAKE_CXX_FLAGS "${flag}")
+  endif()
+  message(STATUS "Configuring with CXX flag '${flag}'")
+endmacro()
+
+macro(add_c_cxx_flag flag)
+  add_c_flag(${flag})
+  add_cxx_flag(${flag})
+endmacro()
+
+macro(add_check_c_flag flag)
+  string(REGEX REPLACE "[-=]" "_" flagname ${flag})
+  check_c_compiler_flag("${flag}" HAVE_FLAG${flagname})
+  if(HAVE_FLAG${flagname})
+    add_c_flag(${flag})
+  endif()
+endmacro()
+
+macro(add_check_cxx_flag flag)
+  string(REGEX REPLACE "[-=]" "_" flagname ${flag})
+  check_cxx_compiler_flag("${flag}" HAVE_FLAG${flagname})
+  if(HAVE_FLAG${flagname})
+    add_cxx_flag(${flag})
+  endif()
+endmacro()
+
+macro(add_check_c_cxx_flag flag)
+  add_check_c_flag(${flag})
+  add_check_cxx_flag(${flag})
+endmacro()
+
+macro(add_required_cxx_flag flag)
+  string(REGEX REPLACE "[-=]" "_" flagnamename ${flag})
+  check_cxx_compiler_flag("${flag}" HAVE_FLAG${flagname})
+  if (NOT HAVE_FLAG${flagname})
+    message(FATAL_ERROR "Required compiler flag ${flag} not supported")
+  endif()
+  add_cxx_flag(${flag})
+endmacro()
+
+macro(add_required_c_flag flag)
+  string(REGEX REPLACE "[-=]" "_" flagname ${flag})
+  check_c_compiler_flag("${flag}" HAVE_FLAG${flagname})
+  if (NOT HAVE_FLAG${flagname})
+    message(FATAL_ERROR "Required compiler flag ${flag} not supported")
+  endif()
+  add_c_flag(${flag})
+endmacro()
+
+macro(add_required_c_cxx_flag flag)
+  add_required_c_flag(${flag})
+  add_required_cxx_flag(${flag})
+endmacro()
+
+# CVC4 Boolean options are three-valued to detect if an option was set by the
+# user. The available values are: IGNORE (default), ON, OFF
+# Default options do not override options that were set by the user, i.e.,
+# cvc4_set_option only sets an option if it's value is still IGNORE.
+# This e.g., allows the user to disable proofs for debug builds (where proofs
+# are enabled by default).
+macro(cvc4_option var description)
+  set(${var} IGNORE CACHE STRING "${description}")
+  # Provide drop down menu options in cmake-gui
+  set_property(CACHE ${var} PROPERTY STRINGS IGNORE ON OFF)
+endmacro()
+
+# Only set option if the user did not set an option.
+macro(cvc4_set_option var value)
+  if(${var} STREQUAL "IGNORE")
+    set(${var} ${value})
+  endif()
+endmacro()
+
+# Prepend 'prepand_value' to each element of the list 'in_list'. The result
+# is stored in 'out_list'.
+function(list_prepend in_list prepand_value out_list)
+  foreach(_elem ${${in_list}})
+    list(APPEND ${out_list} "${prepand_value}${_elem}")
+  endforeach()
+  set(${out_list} ${${out_list}} PARENT_SCOPE)
+endfunction()
+
+# Helper to print the configuration of a 2-valued or 3-valued option 'var'
+# with prefix 'str'.
+macro(print_config str var)
+  if(${var} STREQUAL "ON")
+    set(OPT_VAL_STR "on")
+  elseif(${var} STREQUAL "OFF")
+    set(OPT_VAL_STR "off")
+  elseif(${var} STREQUAL "IGNORE")
+    set(OPT_VAL_STR "default")
+  endif()
+  message("${str} ${OPT_VAL_STR}")
+endmacro()
+
+
+#-----------------------------------------------------------------------------#
+# libcvc4 helper macros
+
+# Collect all libraries that must be linked against libcvc4. These will be
+# actually linked in src/CMakeLists.txt with target_link_libaries(...).
+macro(libcvc4_link_libraries library)
+  set(LIBCVC4_LIBRARIES ${LIBCVC4_LIBRARIES} ${library})
+endmacro()
+
+# Collect all include directories that are required for libcvc4. These will be
+# actually included in src/CMakeLists.txt with target_include_directories(...).
+macro(libcvc4_include_directories dirs)
+  set(LIBCVC4_INCLUDES ${LIBCVC4_INCLUDES} ${dirs})
+endmacro()
+
+# Collect all source files that are required to build libcvc4 in LIBCVC4_SRCS
+# or LIBCVC4_GEN_SRCS. If GENERATED is the first argument the sources are
+# added to LIBCVC4_GEN_SRCS. All sources are prepended with the absolute
+# current path path. CMAKE_CURRENT_BINARY_DIR is prepended
+# to generated source files.
+macro(libcvc4_add_sources)
+  set(_sources ${ARGV})
+
+  # Check if the first argument is GENERATED.
+  list(GET _sources 0 _generated)
+  if(${_generated} STREQUAL "GENERATED")
+    list(REMOVE_AT _sources 0)
+    set(_cur_path ${CMAKE_CURRENT_BINARY_DIR})
+    set(_append_to LIBCVC4_GEN_SRCS)
+  else()
+    set(_cur_path ${CMAKE_CURRENT_SOURCE_DIR})
+    set(_append_to LIBCVC4_SRCS)
+  endif()
+
+  # Prepend source files with current path.
+  foreach(_src ${_sources})
+    list(APPEND ${_append_to} "${_cur_path}/${_src}")
+  endforeach()
+
+  file(RELATIVE_PATH
+       _rel_path "${PROJECT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}")
+
+  # Make changes to list ${_append_to} visible to the parent scope if not
+  # called from src/.
+  # Note: ${_append_to} refers to the variable name whereas ${${_append_to}}
+  # refers to the contents of the variable.
+  if(_rel_path)
+    set(${_append_to} ${${_append_to}} PARENT_SCOPE)
+  endif()
+endmacro()