From 60cfe907b17d993b3f092696312a3a41aa9d05f2 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Mon, 18 Jan 2021 22:27:58 -0600 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Paul Romano --- CMakeLists.txt | 1 - cmake/OpenMCConfigVersion.cmake.in | 1 - include/openmc/version.h.in | 12 ++++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7bf646da2..292f8b0a8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,6 @@ set(OPENMC_VERSION_RELEASE 1) set(OPENMC_VERSION ${OPENMC_VERSION_MAJOR}.${OPENMC_VERSION_MINOR}.${OPENMC_VERSION_RELEASE}) configure_file(include/openmc/version.h.in "${CMAKE_BINARY_DIR}/include/openmc/version.h" @ONLY) - # Setup output directories set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) diff --git a/cmake/OpenMCConfigVersion.cmake.in b/cmake/OpenMCConfigVersion.cmake.in index 8cde634e8b..90d345de44 100644 --- a/cmake/OpenMCConfigVersion.cmake.in +++ b/cmake/OpenMCConfigVersion.cmake.in @@ -1,4 +1,3 @@ - set(PACKAGE_VERSION "@OPENMC_VERSION@") # Check whether the requested PACKAGE_FIND_VERSION is compatible diff --git a/include/openmc/version.h.in b/include/openmc/version.h.in index 48c4f8c08f..a7cf51d048 100644 --- a/include/openmc/version.h.in +++ b/include/openmc/version.h.in @@ -2,11 +2,11 @@ namespace openmc { - // OpenMC major, minor, and release numbers - constexpr int VERSION_MAJOR {@OPENMC_VERSION_MAJOR@}; - constexpr int VERSION_MINOR {@OPENMC_VERSION_MINOR@}; - constexpr int VERSION_RELEASE {@OPENMC_VERSION_RELEASE@}; - constexpr bool VERSION_DEV {true}; - constexpr std::array VERSION {VERSION_MAJOR, VERSION_MINOR, VERSION_RELEASE}; +// OpenMC major, minor, and release numbers +constexpr int VERSION_MAJOR {@OPENMC_VERSION_MAJOR@}; +constexpr int VERSION_MINOR {@OPENMC_VERSION_MINOR@}; +constexpr int VERSION_RELEASE {@OPENMC_VERSION_RELEASE@}; +constexpr bool VERSION_DEV {true}; +constexpr std::array VERSION {VERSION_MAJOR, VERSION_MINOR, VERSION_RELEASE}; }