Skip to content

Commit

Permalink
BF: fixed broken parallel build
Browse files Browse the repository at this point in the history
  • Loading branch information
ernst-bablick committed Jan 17, 2025
1 parent db2206b commit 2759030
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ string(REGEX REPLACE "#define OCS_VERSION_PATCH ([0-9]*)" "\\1" VERSION_PATCH "$
string(REGEX REPLACE "#define OCS_VERSION_SUFFIX \"([a-z0-0\-]*)\"" "\\1" VERSION_SUFFIX "${VERSION_SUFFIX}")

# Set the version string and use it to set the version within inst_sge
set(OCS_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}")
configure_file(
"${CMAKE_SOURCE_DIR}/source/dist/inst_sge.in"
"${CMAKE_SOURCE_DIR}/source/dist/inst_sge"
@ONLY
)
#set(OCS_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}")
#configure_file(
# "${CMAKE_SOURCE_DIR}/source/dist/inst_sge.in"
# "${CMAKE_SOURCE_DIR}/source/dist/inst_sge"
# @ONLY
#)

# Set the version string and use it also for the cmake project
project(
Expand Down
2 changes: 1 addition & 1 deletion source/libs/sgeobj/ocs_Version.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#endif

// @todo CHANGE THE VERSION NUMBERS HERE. ADD A NEW VERSION TO THE LIST BELOW IF PACKING OR CULL CHANGES.
// CMakeList.txt and dist/inst_sge will be updated automatically during the next cmake run
// change dist/inst_sge also!
#define OCS_VERSION_MAJOR 9
#define OCS_VERSION_MINOR 1
#define OCS_VERSION_PATCH 0
Expand Down

0 comments on commit 2759030

Please sign in to comment.