Bump version number and reformat CMake file.

bigladder · Mar 14, 2023 · 8f60b8d · 8f60b8d
1 parent 703d157
commit 8f60b8d
Showing 1 changed file with 150 additions and 150 deletions.
diff --git a/src/libkiva/CMakeLists.txt b/src/libkiva/CMakeLists.txt
@@ -4,180 +4,180 @@ project(libkiva)
 include(TargetArch)
 target_architecture(TARGET_ARCH)
 
-if(${TARGET_ARCH} MATCHES "x86_64" OR ${TARGET_ARCH} MATCHES "ia64" OR ${TARGET_ARCH} MATCHES "ppc64")
-  set(BIT "64bit")
-else()
-  set(BIT "32bit")
-endif()
-
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  set(TARGET_OS mac)
-else()
-  set(TARGET_OS ${CMAKE_SYSTEM_NAME})
-endif()
+if (${TARGET_ARCH} MATCHES "x86_64" OR ${TARGET_ARCH} MATCHES "ia64" OR ${TARGET_ARCH} MATCHES "ppc64")
+    set(BIT "64bit")
+else ()
+    set(BIT "32bit")
+endif ()
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set(TARGET_OS mac)
+else ()
+    set(TARGET_OS ${CMAKE_SYSTEM_NAME})
+endif ()
 
 set(KIVA_BUILD_CONFIG ${TARGET_OS}-${CMAKE_CXX_COMPILER_ID}-${BIT})
 string(TOLOWER ${KIVA_BUILD_CONFIG} KIVA_BUILD_CONFIG)
 set(KIVA_BUILD_CONFIG ${KIVA_BUILD_CONFIG} PARENT_SCOPE)
 
 # Default version number
-set( libkiva_VERSION_MAJOR 0 )
-set( libkiva_VERSION_MINOR 6 )
-set( libkiva_VERSION_PATCH 5 )
+set(libkiva_VERSION_MAJOR 0)
+set(libkiva_VERSION_MINOR 6)
+set(libkiva_VERSION_PATCH 6)
+
+if (EXISTS "${kiva_SOURCE_DIR}/.git")
+    file(WRITE ${CMAKE_BINARY_DIR}/arch.txt ${KIVA_BUILD_CONFIG})
+
+    string(TOLOWER "${TARGET_OS}-${BIT}" KIVA_PACKAGE_CONFIG)
+    set(KIVA_PACKAGE_CONFIG ${KIVA_PACKAGE_CONFIG} PARENT_SCOPE)
+
+    if (DEFINED ENV{SRC_BRANCH})
+        set(GIT_BRANCH "$ENV{SRC_BRANCH}")
+    else ()
+        execute_process(
+                COMMAND git rev-parse --abbrev-ref HEAD
+                WORKING_DIRECTORY ${kiva_SOURCE_DIR}
+                RESULT_VARIABLE git_branch_exit_status
+                OUTPUT_VARIABLE GIT_BRANCH
+                OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+
+        if (NOT ${git_branch_exit_status} MATCHES "0")
+            set(GIT_BRANCH "unknown-branch")
+        endif ()
+    endif ()
 
-if(EXISTS "${kiva_SOURCE_DIR}/.git")
-  file(WRITE ${CMAKE_BINARY_DIR}/arch.txt ${KIVA_BUILD_CONFIG})
+    execute_process(
+            COMMAND git rev-parse --verify --short HEAD
+            WORKING_DIRECTORY ${kiva_SOURCE_DIR}
+            RESULT_VARIABLE git_sha_exit_status
+            OUTPUT_VARIABLE GIT_SHA
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
 
-  string(TOLOWER "${TARGET_OS}-${BIT}" KIVA_PACKAGE_CONFIG)
-  set(KIVA_PACKAGE_CONFIG ${KIVA_PACKAGE_CONFIG} PARENT_SCOPE)
+    if (NOT ${git_sha_exit_status} MATCHES "0")
+        set(GIT_SHA "unknown-commit")
+    endif ()
 
-  if(DEFINED ENV{SRC_BRANCH})
-    set(GIT_BRANCH "$ENV{SRC_BRANCH}")
-  else()
     execute_process(
-      COMMAND git rev-parse --abbrev-ref HEAD
-      WORKING_DIRECTORY ${kiva_SOURCE_DIR}
-      RESULT_VARIABLE git_branch_exit_status
-      OUTPUT_VARIABLE GIT_BRANCH
-      OUTPUT_STRIP_TRAILING_WHITESPACE
+            COMMAND git describe --tags --abbrev=0
+            WORKING_DIRECTORY ${kiva_SOURCE_DIR}
+            RESULT_VARIABLE git_tag_exit_status
+            OUTPUT_VARIABLE GIT_TAG
+            OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 
-    if (NOT ${git_branch_exit_status} MATCHES "0")
-      set(GIT_BRANCH "unknown-branch")
-    endif()
-  endif()
-
-  execute_process(
-    COMMAND git rev-parse --verify --short HEAD
-    WORKING_DIRECTORY ${kiva_SOURCE_DIR}
-    RESULT_VARIABLE git_sha_exit_status
-    OUTPUT_VARIABLE GIT_SHA
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-
-  if (NOT ${git_sha_exit_status} MATCHES "0")
-    set(GIT_SHA "unknown-commit")
-  endif()
-
-  execute_process(
-    COMMAND git describe --tags --abbrev=0
-    WORKING_DIRECTORY ${kiva_SOURCE_DIR}
-    RESULT_VARIABLE git_tag_exit_status
-    OUTPUT_VARIABLE GIT_TAG
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-
-  if (NOT ${git_tag_exit_status} MATCHES "0")
-    set(GIT_TAG "unknown-tag")
-    message("Cannot determine version number.")
-  endif()
-
-  if (GIT_TAG MATCHES "^v[0-9]+\\.[0-9]+\\.[0-9]+$")
-    string( REGEX REPLACE "^v([0-9]+)\\.[0-9]+\\.[0-9]+$" "\\1" libkiva_VERSION_MAJOR "${GIT_TAG}" )
-    string( REGEX REPLACE "^v[0-9]+\\.([0-9]+)\\.[0-9]+$" "\\1" libkiva_VERSION_MINOR "${GIT_TAG}" )
-    string( REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+)$" "\\1" libkiva_VERSION_PATCH "${GIT_TAG}" )
-  endif()
-
-  execute_process(
-    COMMAND git rev-list --count HEAD ^${GIT_TAG}
-    WORKING_DIRECTORY ${kiva_SOURCE_DIR}
-    RESULT_VARIABLE git_build_exit_status
-    OUTPUT_VARIABLE GIT_BUILD
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-
-  if (NOT ${git_build_exit_status} MATCHES "0")
-    set(GIT_BUILD "unknown-build-number")
-  endif()
-
-  if(NOT ${GIT_BUILD} MATCHES "^0$")
-    set(libkiva_VERSION_BUILD "+${GIT_BRANCH}.${GIT_SHA}.${GIT_BUILD}")
-  else()
-    set(libkiva_VERSION_BUILD "")
-  endif()
-
-else()
-  set( libkiva_VERSION_BUILD "+no-build-info" )
-endif()
+    if (NOT ${git_tag_exit_status} MATCHES "0")
+        set(GIT_TAG "unknown-tag")
+        message("Cannot determine version number.")
+    endif ()
+
+    if (GIT_TAG MATCHES "^v[0-9]+\\.[0-9]+\\.[0-9]+$")
+        string(REGEX REPLACE "^v([0-9]+)\\.[0-9]+\\.[0-9]+$" "\\1" libkiva_VERSION_MAJOR "${GIT_TAG}")
+        string(REGEX REPLACE "^v[0-9]+\\.([0-9]+)\\.[0-9]+$" "\\1" libkiva_VERSION_MINOR "${GIT_TAG}")
+        string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+)$" "\\1" libkiva_VERSION_PATCH "${GIT_TAG}")
+    endif ()
+
+    execute_process(
+            COMMAND git rev-list --count HEAD ^${GIT_TAG}
+            WORKING_DIRECTORY ${kiva_SOURCE_DIR}
+            RESULT_VARIABLE git_build_exit_status
+            OUTPUT_VARIABLE GIT_BUILD
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+    if (NOT ${git_build_exit_status} MATCHES "0")
+        set(GIT_BUILD "unknown-build-number")
+    endif ()
+
+    if (NOT ${GIT_BUILD} MATCHES "^0$")
+        set(libkiva_VERSION_BUILD "+${GIT_BRANCH}.${GIT_SHA}.${GIT_BUILD}")
+    else ()
+        set(libkiva_VERSION_BUILD "")
+    endif ()
+
+else ()
+    set(libkiva_VERSION_BUILD "+no-build-info")
+endif ()
 
 set(kiva_version "v${libkiva_VERSION_MAJOR}.${libkiva_VERSION_MINOR}.${libkiva_VERSION_PATCH}${libkiva_VERSION_BUILD}")
 
-if ( "${CMAKE_BUILD_TYPE}" STREQUAL "" OR "${CMAKE_BUILD_TYPE}" STREQUAL "Release" )
-  set (kiva_version "${kiva_version}")
-else()
-  set (kiva_version "${kiva_version}-${CMAKE_BUILD_TYPE}")
-endif()
+if ("${CMAKE_BUILD_TYPE}" STREQUAL "" OR "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+    set(kiva_version "${kiva_version}")
+else ()
+    set(kiva_version "${kiva_version}-${CMAKE_BUILD_TYPE}")
+endif ()
 
 set(VERSION_NUMBER "${kiva_version} (${KIVA_BUILD_CONFIG})")
 
-if(KIVA_EXE_BUILD)
-  message("-- Building Kiva version: ${VERSION_NUMBER}")
-  set(CPACK_PACKAGE_VERSION_MAJOR "${libkiva_VERSION_MAJOR}" PARENT_SCOPE)
-  set(CPACK_PACKAGE_VERSION_MINOR "${libkiva_VERSION_MINOR}" PARENT_SCOPE)
-  set(CPACK_PACKAGE_VERSION_PATCH "${libkiva_VERSION_PATCH}" PARENT_SCOPE)
-  set(CPACK_PACKAGE_VERSION_BUILD "${libkiva_VERSION_BUILD}" PARENT_SCOPE)
-endif()
+if (KIVA_EXE_BUILD)
+    message("-- Building Kiva version: ${VERSION_NUMBER}")
+    set(CPACK_PACKAGE_VERSION_MAJOR "${libkiva_VERSION_MAJOR}" PARENT_SCOPE)
+    set(CPACK_PACKAGE_VERSION_MINOR "${libkiva_VERSION_MINOR}" PARENT_SCOPE)
+    set(CPACK_PACKAGE_VERSION_PATCH "${libkiva_VERSION_PATCH}" PARENT_SCOPE)
+    set(CPACK_PACKAGE_VERSION_BUILD "${libkiva_VERSION_BUILD}" PARENT_SCOPE)
+endif ()
 # End Version and build info
 
 
 string(TIMESTAMP YEAR %Y)
 
-configure_file (
-    "${PROJECT_SOURCE_DIR}/Version.hpp.in"
-    "${PROJECT_BINARY_DIR}/Version.hpp"
+configure_file(
+        "${PROJECT_SOURCE_DIR}/Version.hpp.in"
+        "${PROJECT_BINARY_DIR}/Version.hpp"
 )
 
 set(libkiva_src Aggregator.cpp
-             Aggregator.hpp
-             Algorithms.cpp
-             Algorithms.hpp
-             BoundaryConditions.hpp
-             Cell.cpp
-             Cell.hpp
-             Domain.cpp
-             Domain.hpp
-             Errors.cpp
-             Errors.hpp
-             Foundation.cpp
-             Foundation.hpp
-             Functions.cpp
-             Functions.hpp
-             Geometry.cpp
-             Geometry.hpp
-             Ground.cpp
-             Ground.hpp
-             GroundOutput.hpp
-             Instance.cpp
-             Instance.hpp
-             Mesher.cpp
-             Mesher.hpp
-             "${PROJECT_BINARY_DIR}/Version.hpp" )
-
-option( KIVA_STATIC_LIB "Make libkiva a static library" ON )
+        Aggregator.hpp
+        Algorithms.cpp
+        Algorithms.hpp
+        BoundaryConditions.hpp
+        Cell.cpp
+        Cell.hpp
+        Domain.cpp
+        Domain.hpp
+        Errors.cpp
+        Errors.hpp
+        Foundation.cpp
+        Foundation.hpp
+        Functions.cpp
+        Functions.hpp
+        Geometry.cpp
+        Geometry.hpp
+        Ground.cpp
+        Ground.hpp
+        GroundOutput.hpp
+        Instance.cpp
+        Instance.hpp
+        Mesher.cpp
+        Mesher.hpp
+        "${PROJECT_BINARY_DIR}/Version.hpp")
+
+option(KIVA_STATIC_LIB "Make libkiva a static library" ON)
 
 if (KIVA_STATIC_LIB)
-  add_library(libkiva STATIC ${libkiva_src})
-  target_compile_definitions(libkiva PRIVATE LIBKIVA_STATIC_DEFINE)
-  if(UNIX)
-    target_compile_options(libkiva PUBLIC -fPIC)
-  endif()
-else()
-  set(CMAKE_MACOSX_RPATH 1)
-  add_library(libkiva SHARED ${libkiva_src})
-  if(KIVA_EXE_BUILD)
-    install(TARGETS libkiva DESTINATION bin/)
-  endif()
-endif()
-
-if(${KIVA_3D})
-  target_compile_definitions(libkiva PRIVATE KIVA_3D )
-endif()
+    add_library(libkiva STATIC ${libkiva_src})
+    target_compile_definitions(libkiva PRIVATE LIBKIVA_STATIC_DEFINE)
+    if (UNIX)
+        target_compile_options(libkiva PUBLIC -fPIC)
+    endif ()
+else ()
+    set(CMAKE_MACOSX_RPATH 1)
+    add_library(libkiva SHARED ${libkiva_src})
+    if (KIVA_EXE_BUILD)
+        install(TARGETS libkiva DESTINATION bin/)
+    endif ()
+endif ()
+
+if (${KIVA_3D})
+    target_compile_definitions(libkiva PRIVATE KIVA_3D)
+endif ()
 
 target_include_directories(libkiva PUBLIC
-  "${libkiva_BINARY_DIR}"
-  "${libkiva_SOURCE_DIR}"
-  "${BOOST_SOURCE_DIR}"
-  "${kiva_SOURCE_DIR}/vendor/eigen")
+        "${libkiva_BINARY_DIR}"
+        "${libkiva_SOURCE_DIR}"
+        "${BOOST_SOURCE_DIR}"
+        "${kiva_SOURCE_DIR}/vendor/eigen")
 
 target_link_libraries(libkiva PRIVATE kiva_common_interface)
 target_compile_features(libkiva PUBLIC cxx_std_17) # Should be PRIVATE once boost is cleaned out of public API
@@ -188,13 +188,13 @@ generate_export_header(libkiva)
 set_target_properties(libkiva PROPERTIES OUTPUT_NAME kiva)
 set_target_properties(libkiva PROPERTIES PDB_NAME libkiva)
 
-if(${ENABLE_OPENMP})
-  target_link_options(libkiva PUBLIC -fopenmp)
-  target_compile_options(libkiva PUBLIC -fopen)
-endif()
+if (${ENABLE_OPENMP})
+    target_link_options(libkiva PUBLIC -fopenmp)
+    target_compile_options(libkiva PUBLIC -fopen)
+endif ()
 
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${kiva_link_flags}")
 
 if (KIVA_COVERAGE)
-  add_coverage(libkiva)
-endif()
+    add_coverage(libkiva)
+endif ()