windowsify compiler options

Matthias Güdemann · tautschnig · commit 64163725f4ef · 2018-06-21T15:42:21.000Z
diff --git a/jbmc/src/janalyzer/Makefile b/jbmc/src/janalyzer/Makefile
@@ -33,8 +33,6 @@ CLEANFILES = janalyzer$(EXEEXT)
 
 all: janalyzer$(EXEEXT)
 
-CP_CXXFLAGS += -DCBMC_VERSION="\"$(CBMC_VERSION) ($(GIT_INFO))\""
-
 ifneq ($(wildcard ../jsil/Makefile),)
   OBJ += ../jsil/jsil$(LIBEXT)
   CP_CXXFLAGS += -DHAVE_JSIL
diff --git a/jbmc/src/jbmc/Makefile b/jbmc/src/jbmc/Makefile
@@ -63,8 +63,6 @@ CLEANFILES = jbmc$(EXEEXT)
 
 all: jbmc$(EXEEXT)
 
-CP_CXXFLAGS += -DCBMC_VERSION="\"$(CBMC_VERSION) ($(GIT_INFO))\""
-
 ###############################################################################
 
 jbmc$(EXEEXT): $(OBJ)
diff --git a/jbmc/src/jdiff/Makefile b/jbmc/src/jdiff/Makefile
@@ -45,8 +45,6 @@ CLEANFILES = jdiff$(EXEEXT)
 
 all: jdiff$(EXEEXT)
 
-CP_CXXFLAGS += -DCBMC_VERSION="\"$(CBMC_VERSION) ($(GIT_INFO))\""
-
 ###############################################################################
 
 jdiff$(EXEEXT): $(OBJ)
diff --git a/src/cbmc/Makefile b/src/cbmc/Makefile
@@ -56,15 +56,15 @@ INCLUDES= -I ..
 
 LIBS =
 
+CBMC_VERSION_FILES = cbmc_solvers$(OBJEXT)
+
 include ../config.inc
 include ../common
 
 CLEANFILES = cbmc$(EXEEXT)
 
 all: cbmc$(EXEEXT)
 
-CP_CXXFLAGS += -DCBMC_VERSION="\"$(CBMC_VERSION) ($(GIT_INFO))\""
-
 ifneq ($(wildcard ../bv_refinement/Makefile),)
   OBJ += ../bv_refinement/bv_refinement$(LIBEXT)
   CP_CXXFLAGS += -DHAVE_BV_REFINEMENT
diff --git a/src/clobber/Makefile b/src/clobber/Makefile
@@ -30,8 +30,6 @@ CLEANFILES = clobber$(EXEEXT)
 
 all: clobber$(EXEEXT)
 
-CP_CXXFLAGS += -DCBMC_VERSION="\"$(CBMC_VERSION) ($(GIT_INFO))\""
-
 ###############################################################################
 
 clobber$(EXEEXT): $(OBJ)
diff --git a/src/common b/src/common
@@ -227,6 +227,17 @@ OBJ += $(patsubst %.cc, %$(OBJEXT), $(filter %.cc, $(SRC)))
 %.obj:%.c
 	$(CC) $(CP_CFLAGS) /nologo /c /EHsc $< /Fo$@
 
+# get version from git
+GIT_INFO = $(shell git describe --tags --always --dirty || echo "n/a")
+
+CBMC_VERSION_FILES += $(filter %_parse_options$(OBJEXT), $(OBJ))
+
+ifeq ($(BUILD_ENV_),MSVC)
+$(CBMC_VERSION_FILES): CP_CXXFLAGS += /DCBMC_VERSION='"""$(CBMC_VERSION) ($(GIT_INFO))"""'
+else
+$(CBMC_VERSION_FILES): CP_CXXFLAGS += -DCBMC_VERSION="\"$(CBMC_VERSION) ($(GIT_INFO))\""
+endif
+
 clean:
 	$(RM) $(patsubst %.cpp, %$(OBJEXT), $(filter %.cpp, $(SRC))) \
 		$(patsubst %.cpp, %$(DEPEXT), $(filter %.cpp, $(SRC))) \
@@ -252,4 +263,3 @@ D_FILES1 = $(SRC:.c=$(DEPEXT))
 D_FILES = $(D_FILES1:.cpp=$(DEPEXT))
 
 -include $(D_FILES)
-
diff --git a/src/config.inc b/src/config.inc
@@ -73,4 +73,3 @@ OSX_IDENTITY="Developer ID Application: Daniel Kroening"
 
 # Detailed version information
 CBMC_VERSION = 5.8
-GIT_INFO = $(shell git describe --tags --always --dirty || echo "n/a")
diff --git a/src/goto-analyzer/Makefile b/src/goto-analyzer/Makefile
@@ -32,8 +32,6 @@ CLEANFILES = goto-analyzer$(EXEEXT)
 
 all: goto-analyzer$(EXEEXT)
 
-CP_CXXFLAGS += -DCBMC_VERSION="\"$(CBMC_VERSION) ($(GIT_INFO))\""
-
 ifneq ($(wildcard ../jsil/Makefile),)
   OBJ += ../jsil/jsil$(LIBEXT)
   CP_CXXFLAGS += -DHAVE_JSIL
diff --git a/src/goto-cc/Makefile b/src/goto-cc/Makefile
@@ -38,6 +38,11 @@ LIBS =
 
 CLEANFILES = goto-cc$(EXEEXT) goto-cl$(EXEEXT)
 
+CBMC_VERSION_FILES = as_mode$(OBJEXT) \
+                     compile$(OBJEXT) \
+                     gcc_mode$(OBJEXT) \
+                     goto_cc_mode$(OBJEXT)
+
 include ../config.inc
 include ../common
 
@@ -46,8 +51,6 @@ all: goto-cl$(EXEEXT)
 endif
 all: goto-cc$(EXEEXT)
 
-CP_CXXFLAGS += -DCBMC_VERSION="\"$(CBMC_VERSION) ($(GIT_INFO))\""
-
 ifneq ($(wildcard ../jsil/Makefile),)
   OBJ += ../jsil/jsil$(LIBEXT)
   CP_CXXFLAGS += -DHAVE_JSIL
diff --git a/src/goto-diff/Makefile b/src/goto-diff/Makefile
@@ -44,8 +44,6 @@ CLEANFILES = goto-diff$(EXEEXT)
 
 all: goto-diff$(EXEEXT)
 
-CP_CXXFLAGS += -DCBMC_VERSION="\"$(CBMC_VERSION) ($(GIT_INFO))\""
-
 ###############################################################################
 
 goto-diff$(EXEEXT): $(OBJ)
diff --git a/src/goto-instrument/Makefile b/src/goto-instrument/Makefile
@@ -101,8 +101,6 @@ include ../common
 
 all: goto-instrument$(EXEEXT) goto-instrument$(LIBEXT)
 
-CP_CXXFLAGS += -DCBMC_VERSION="\"$(CBMC_VERSION) ($(GIT_INFO))\""
-
 ifneq ($(LIB_GLPK),)
   LIBS += $(LIB_GLPK)
   CP_CXXFLAGS += -DHAVE_GLPK
diff --git a/src/memory-models/Makefile b/src/memory-models/Makefile
@@ -22,8 +22,6 @@ CLEANFILES = memory_models$(LIBEXT) \
 
 all: mmcc$(EXEEXT)
 
-CP_CXXFLAGS += -DCBMC_VERSION="\"$(CBMC_VERSION) ($(GIT_INFO))\""
-
 ###############################################################################
 
 mm_y.tab.cpp: parser.y

Original file line number	Diff line number	Diff line change
`@@ -73,4 +73,3 @@ OSX_IDENTITY="Developer ID Application: Daniel Kroening"`
`73`	`73`
`74`	`74`	`# Detailed version information`
`75`	`75`	`CBMC_VERSION = 5.8`
`76`		`-GIT_INFO = $(shell git describe --tags --always --dirty \|\| echo "n/a")`