Fixed - root CMakeLists.txt did not request C++11 support for Win32 b…

…uild. Fixed - defects4importoptions.h for io_dlpoly was not included in makedist target. Fixed - EXTRA_DIST target in root Makefile.am did not account for new test directory layout.

CMakeLists.txt

@@ -51,6 +51,9 @@ CMAKE_POLICY(SET CMP0020 NEW)
 if(WIN32)
   set (target_name Aten)
 
+  # Request C++11 Standard Support (Required for Qt 5.7)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+
   # Adjust external include directories
   include_directories(
     ${FTGL_INCLUDE_DIRS}

Makefile.am

@@ -6,7 +6,7 @@ SUFFIXES: .dt
 	sed -e "s:PREFIX:@INSTALLDIR@:" -e "s:VERSION:@VERSION@:" $< > $@
 
 EXTRA_DIST = src/gui/icons/*.* src/gui/freefont/*
-EXTRA_DIST += data/ff/* data/fftesting/* data/filters/* data/fragments/*/* data/partitions/* data/test/* data/scripts/* data/external/*
+EXTRA_DIST += data/ff/* data/fftesting/* data/filters/* data/fragments/*/* data/partitions/* data/test/*/* data/scripts/* data/external/*
 EXTRA_DIST += TODO TODO2
 EXTRA_DIST += CMakeLists.txt cmake/* src/CMakeLists.txt src/*/CMakeLists.txt
 EXTRA_DIST += desktop.cmake

src/plugins/io_dlpoly/Makefile.am

@@ -60,5 +60,4 @@ dlp4defects_la_LDFLAGS = -module -shared -avoid-version
 
 AM_CPPFLAGS = -I${top_srcdir}/src @ATEN_INCLUDES@ @ATEN_CFLAGS@
 
-noinst_HEADERS = common.h dlp2exportoptions.h dlp2importoptions.h dlp4exportoptions.h dlp4importoptions.h
-
+noinst_HEADERS = common.h defects4importoptions.h dlp2exportoptions.h dlp2importoptions.h dlp4exportoptions.h dlp4importoptions.h