Updated version and minor changes to build settings

NERSC · Apr 14, 2018 · f60675a · f60675a
1 parent 5e2ee8d
commit f60675a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/.version.txt b/.version.txt
@@ -1 +1 @@
-1.3.0
+1.3.1
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,14 @@
 TiMemory
 ========
 
+Release: TiMemory 1.3.1
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Author: Jonathan R. Madsen
+Date:   Thu Apr 12 02:02:20 2018 -0700
+
+    - Fixes to Windows
+
 Release: TiMemory 1.3.0
 ~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/cmake/Modules/BuildSettings.cmake b/cmake/Modules/BuildSettings.cmake
@@ -83,11 +83,12 @@ set(LIBNAME timemory)
 # set the compiler flags if not on Windows
 if(NOT SUBPROJECT AND NOT WIN32)
 
-    add(CMAKE_CXX_FLAGS "-W -Wall -Wextra -faligned-new ${CXXFLAGS} $ENV{CXXFLAGS}")
+    add(CMAKE_CXX_FLAGS "-W -Wall -Wextra ${CXXFLAGS} $ENV{CXXFLAGS}")
     add(CMAKE_CXX_FLAGS "-Wno-unused-parameter -Wno-unknown-pragmas")
     add(CMAKE_CXX_FLAGS "-Wunused-but-set-parameter -Wno-unused-variable")
 
     if(NOT CMAKE_CXX_COMPILER_IS_INTEL)
+        add(CMAKE_CXX_FLAGS "-faligned-new")
         add(CMAKE_CXX_FLAGS "-Wno-unknown-warning-option")
         add(CMAKE_CXX_FLAGS "-Wno-implicit-fallthrough")
         add(CMAKE_CXX_FLAGS "-Wno-shadow-field-in-constructor-modified")
@@ -96,11 +97,12 @@ if(NOT SUBPROJECT AND NOT WIN32)
         add(CMAKE_CXX_FLAGS "-Wno-unused-private-field")
     endif(NOT CMAKE_CXX_COMPILER_IS_INTEL)
 
-    add(CMAKE_C_FLAGS "-W -Wall -Wextra -faligned-new ${CFLAGS} $ENV{CFLAGS}")
+    add(CMAKE_C_FLAGS "-W -Wall -Wextra ${CFLAGS} $ENV{CFLAGS}")
     add(CMAKE_C_FLAGS "-Wno-unused-parameter")
     add(CMAKE_C_FLAGS "-Wunused-but-set-parameter -Wno-unused-variable")
 
     if(NOT CMAKE_C_COMPILER_IS_INTEL)
+        add(CMAKE_CXX_FLAGS "-faligned-new")
         add(CMAKE_C_FLAGS "-Wno-unknown-warning-option")
         add(CMAKE_C_FLAGS "-Wno-implicit-fallthrough")
         add(CMAKE_C_FLAGS "-Wno-shadow-field-in-constructor-modified")
@@ -130,17 +132,11 @@ if(NOT SUBPROJECT AND NOT WIN32)
 
 elseif(NOT WIN32)
 
-    if(NOT CMAKE_CXX_COMPILER_IS_INTEL)
-        add(CMAKE_CXX_FLAGS "-Wno-exceptions")
-        add(CMAKE_CXX_FLAGS "-Wno-unused-private-field")
-    endif(NOT CMAKE_CXX_COMPILER_IS_INTEL)
+    #add_c_flags(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+    #add_cxx_flags(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 
 endif(NOT SUBPROJECT AND NOT WIN32)
 
 if(TIMEMORY_EXCEPTIONS)
-    if(WIN32)
-        add_definitions(/DTIMEMORY_EXCEPTIONS)
-    else(WIN32)
-        add_definitions(-DTIMEMORY_EXCEPTIONS)
-    endif(WIN32)
-endif()
+    add_definitions(-DTIMEMORY_EXCEPTIONS)
+endif(TIMEMORY_EXCEPTIONS)