Skip to content

Revert "cmake file corrections" #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 30, 2018
Merged

Revert "cmake file corrections" #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cmake/CSEVersion.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,16 @@ if (NOT ${git_build_exit_status} MATCHES "0")
set(GIT_BUILD "unknown-build-number")
endif()

if(NOT ${GIT_BUILD} MATCHES "0")
if(NOT ${GIT_BUILD} MATCHES "^0$")
set(CSEVRSN_META "+${GIT_BRANCH}.${GIT_SHA}.${GIT_BUILD}")
else()
set(CSEVRSN_META "")
endif()

message("Building CSE ${CSEVRSN_MAJOR}.${CSEVRSN_MINOR}.${CSEVRSN_PATCH}${CSEVRSN_META}")

configure_file(
"${PROJECT_SOURCE_DIR}/src/csevrsn.h.in"
"${PROJECT_SOURCE_DIR}/src/csevrsn.h"
)

18 changes: 13 additions & 5 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
add_subdirectory(RCDEF)

# Run C Preprocessor on *.DEF files
set(defs
CNDTYPES.DEF
CNUNITS.DEF
DTLIMS.DEF
CNFIELDS.DEF
CNRECS.DEF
)

macro(c_preprocess file)
add_custom_command(
OUTPUT "${file}.i"
Expand All @@ -10,11 +18,10 @@ macro(c_preprocess file)
)
endmacro()

c_preprocess(cndtypes)
c_preprocess(cnunits)
c_preprocess(dtlims)
c_preprocess(cnfields)
c_preprocess(cnrecs)
foreach(defFile ${defs})
string(REGEX REPLACE "^(\\w).DEF$" "\\1" file "${defFile}")
c_preprocess(${file})
endforeach()

# Run RCDEF
add_custom_command(
Expand Down Expand Up @@ -220,6 +227,7 @@ set(libs

source_group("Source Files" FILES ${source})
source_group("Header Files" FILES ${headers})
source_group("Def Files" FILES ${defs})

target_link_libraries(CSE ${libs})

Expand Down