build: Build the examples and tests on MSVC builds

fanc999-1 · kjellahl · commit 2a2f912533f2 · 2018-09-10T15:16:53.000+02:00
Also add a BOOST_DLL option for one to build the benchmark program
for libsigc++, which is needed on Visual Studio builds if the
installed Boost libraries are built as DLLs.
diff --git a/MSVC_NMake/Makefile.vc b/MSVC_NMake/Makefile.vc
@@ -34,13 +34,15 @@ VALID_MSC = TRUE
 # into the lists we need for compilation and introspection
 !include create-lists-msvc.mak
 
-all: $(LIBSIGC_LIB) all-build-info
+all: $(LIBSIGC_LIB) $(libsigc_ex) all-build-info
 
-tests: all
+tests: $(libsigc_tests) all-build-info
+
+benchmark: all $(libsigc_bench) all-build-info
 
 # Include the build rules for sources, DLLs and executables
-!include build-rules-msvc.mak
 !include generate-msvc.mak
+!include build-rules-msvc.mak
 
 !include install.mak
 
diff --git a/MSVC_NMake/build-rules-msvc.mak b/MSVC_NMake/build-rules-msvc.mak
@@ -23,6 +23,8 @@ $<
 $<
 <<
 
+$(CFG)\$(PLAT)\libsigcpp-tests\testutilities.obj: $(CFG)\$(PLAT)\libsigcpp-tests ..\tests\testutilities.cc
+	$(CXX) $(SIGCPP_CFLAGS) /Fo$@ /c ..\tests\testutilities.cc
 # Rules for building .lib files
 $(LIBSIGC_LIB): $(LIBSIGC_DLL)
 
@@ -50,17 +52,36 @@ $(libsigcpp_dll_OBJS)
 # <<
 # 	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
 
-$(CFG)\$(PLAT)\gjs-console.exe: $(CFG)\$(PLAT)\gjs.lib $(CFG)\$(PLAT)\gjs-console $(gjs_OBJS)
-	link $(LDFLAGS) $(CFG)\$(PLAT)\gjs.lib $(GJS_BASE_LIBS) -out:$@ $(gjs_OBJS)
+{..\examples\}.cc{$(CFG)\$(PLAT)\}.exe:
+	@if not exist $(CFG)\$(PLAT)\libsigcpp-ex $(MAKE) -f Makefile.vc CFG=$(CFG) $(CFG)\$(PLAT)\libsigcpp-ex
+	@if not exist $(LIBSIGC_LIB) $(MAKE) -f Makefile.vc CFG=$(CFG) $(LIBSIGC_LIB)
+	$(CXX) $(SIGCPP_CFLAGS) /Fo$(CFG)\$(PLAT)\libsigcpp-ex\ $< /Fe$@ /link $(LDFLAGS) $(LIBSIGC_LIB)
+	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
+
+{..\tests\}.cc{$(CFG)\$(PLAT)\}.exe:
+	@if not exist $(LIBSIGC_LIB) $(MAKE) -f Makefile.vc CFG=$(CFG) $(LIBSIGC_LIB)
+	@if not exist $(CFG)\$(PLAT)\libsigcpp-tests\testutilities.obj $(MAKE) -f Makefile.vc CFG=$(CFG) $(CFG)\$(PLAT)\libsigcpp-tests\testutilities.obj
+	$(CXX) $(SIGCPP_CFLAGS) /Fo$(CFG)\$(PLAT)\libsigcpp-tests\ $< /Fe$@ /link $(LDFLAGS) $(LIBSIGC_LIB) $(CFG)\$(PLAT)\libsigcpp-tests\testutilities.obj
+	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
+
+$(CFG)\$(PLAT)\libsigc++-benchmark.exe: ..\tests\benchmark.cc
+	@if not exist $(LIBSIGC_LIB) $(MAKE) -f Makefile.vc CFG=$(CFG) $(LIBSIGC_LIB)
+	@if not exist $(CFG)\$(PLAT)\libsigcpp-tests\testutilities.obj $(MAKE) -f Makefile.vc CFG=$(CFG) $(CFG)\$(PLAT)\libsigcpp-tests\testutilities.obj
+	$(CXX) $(SIGCPP_BENCHMARK_CFLAGS) /Fo$(CFG)\$(PLAT)\libsigcpp-tests\ ..\tests\benchmark.cc /Fe$@ /link $(LDFLAGS) $(LIBSIGC_LIB) $(CFG)\$(PLAT)\libsigcpp-tests\testutilities.obj
 	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
 
 clean:
-	@-del /f /q $(CFG)\$(PLAT)\*.pdb
+	@-del /f /q $(CFG)\$(PLAT)\*.exe
 	@-del /f /q $(CFG)\$(PLAT)\*.dll
+	@-del /f /q $(CFG)\$(PLAT)\*.pdb
 	@-del /f /q $(CFG)\$(PLAT)\*.ilk
 	@-del /f /q $(CFG)\$(PLAT)\*.exp
 	@-del /f /q $(CFG)\$(PLAT)\*.lib
+	@-if exist $(CFG)\$(PLAT)\libsigcpp-tests del /f /q $(CFG)\$(PLAT)\libsigcpp-tests\*.obj
+	@-del /f /q $(CFG)\$(PLAT)\libsigcpp-ex\*.obj
 	@-del /f /q $(CFG)\$(PLAT)\libsigcpp\*.res
 	@-del /f /q $(CFG)\$(PLAT)\libsigcpp\*.obj
+	@-if exist $(CFG)\$(PLAT)\libsigcpp-tests rd $(CFG)\$(PLAT)\libsigcpp-tests
+	@-rd $(CFG)\$(PLAT)\libsigcpp-ex
 	@-rd $(CFG)\$(PLAT)\libsigcpp
 	@-del /f /q vc$(PDBVER)0.pdb
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
@@ -16,7 +16,7 @@ LIBSIGC_DEBUG_SUFFIX =
 
 LIBSIGCPP_DEFINES = /DSIGC_BUILD /D_WINDLL
 
-SIGCPP_BASE_CFLAGS = /I.. /I. /wd4530 /std:c++17
+SIGCPP_BASE_CFLAGS = /I.. /I. /wd4530 /std:c++17 $(CFLAGS)
 
 LIBSIGC_INT_SOURCES = $(sigc_sources_cc:/=\)
 LIBSIGC_INT_HDRS = $(sigc_public_h:/=\)
@@ -31,3 +31,13 @@ LIBSIGC_LIBNAME = sigc-vc$(VSVER)0$(LIBSIGC_DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSIO
 
 LIBSIGC_DLL = $(CFG)\$(PLAT)\$(LIBSIGC_LIBNAME).dll
 LIBSIGC_LIB = $(CFG)\$(PLAT)\$(LIBSIGC_LIBNAME).lib
+
+# Note that building the benchmark requires Boost!
+libsigc_bench = $(CFG)\$(PLAT)\libsigc++-benchmark.exe
+
+# If your Boost libraries are built as DLLs, use BOOST_DLL=1 in your NMake command line
+!ifdef BOOST_DLL
+SIGCPP_BENCHMARK_CFLAGS = $(SIGCPP_BASE_CFLAGS) /DBOOST_ALL_DYN_LINK
+!else
+SIGCPP_BENCHMARK_CFLAGS = $(SIGCPP_BASE_CFLAGS)
+!endif
diff --git a/MSVC_NMake/create-lists-msvc.mak b/MSVC_NMake/create-lists-msvc.mak
@@ -47,6 +47,26 @@ NULL=
 !if [call create-lists.bat footer libsigcpp.mak]
 !endif
 
+!if [call create-lists.bat header libsigcpp.mak libsigc_ex]
+!endif
+
+!if [for %s in (..\examples\*.cc) do @call create-lists.bat file libsigcpp.mak ^$(CFG)\^$(PLAT)\%~ns.exe]
+!endif
+
+!if [call create-lists.bat footer libsigcpp.mak]
+!endif
+
+!if [call create-lists.bat header libsigcpp.mak libsigc_tests]
+!endif
+
+# Skipping testutilities.cc: Not to be built as a .exe, but is a common dependency for the tests
+#          benchmark: Not built on default; requires Boost
+!if [for %s in (..\tests\*.cc) do @if not "%~ns" == "testutilities" if not "%~ns" == "benchmark" @call create-lists.bat file libsigcpp.mak ^$(CFG)\^$(PLAT)\%~ns.exe]
+!endif
+
+!if [call create-lists.bat footer libsigcpp.mak]
+!endif
+
 !include libsigcpp.mak
 
 !if [del /f /q libsigcpp.mak]
diff --git a/MSVC_NMake/generate-msvc.mak b/MSVC_NMake/generate-msvc.mak
@@ -4,5 +4,5 @@
 # one is maintaining the NMake build files.
 
 # Create the build directories
-$(CFG)\$(PLAT)\libsigcpp:
+$(CFG)\$(PLAT)\libsigcpp $(CFG)\$(PLAT)\libsigcpp-ex $(CFG)\$(PLAT)\libsigcpp-tests:
 	@-mkdir $@
diff --git a/MSVC_NMake/info-msvc.mak b/MSVC_NMake/info-msvc.mak
@@ -28,8 +28,13 @@ help:
 	@echo A 'clean' target is supported to remove all generated files, intermediate
 	@echo object files and binaries for the specified configuration.
 	@echo.
-	@echo An 'install' target is supported to copy the build (DLLs, utility programs,
-	@echo LIBs, along with the introspection files if applicable) to appropriate
-	@echo locations under ^$(PREFIX).
+	@echo An 'install' target is supported to copy the build (DLLs, LIBs, along with
+	@echo the header files) to appropriate locations under ^$(PREFIX).
+	@echo.
+	@echo A 'tests' target is supported to build the test programs, and a 'benchmark'
+	@echo target is supported to build the benchmarking program.  Note that the
+	@echo benchmarking program requires the Boost C++ libraries to build, and you need
+	@echo to pass in BOOST_DLL=1 to the NMake command line if your Boost libraries are
+	@echo built as DLLs.
 	@echo ======
 	@echo.
