From 49396034ea086c6f71b18cef737c31a48025e35d Mon Sep 17 00:00:00 2001
From: Neal Kruis <neal.kruis@bigladdersoftware.com>
Date: Tue, 29 May 2018 16:23:42 -0600
Subject: [PATCH] Revert "cmake file corrections"

This reverts commit 0e3df03c192cf0f18e5d7546faa6e4881bfa1e7a.
---
 cmake/CSEVersion.cmake |  5 ++++-
 src/CMakeLists.txt     | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/cmake/CSEVersion.cmake b/cmake/CSEVersion.cmake
index 116c556a4..8d9c98769 100644
--- a/cmake/CSEVersion.cmake
+++ b/cmake/CSEVersion.cmake
@@ -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"
 )
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5e96e8265..d15593429 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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"
@@ -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(
@@ -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})