Merge branch 'master' into release

Conflicts: src/pwl/compression_pwl.c
PCMSolver · Oct 20, 2014 · ad998d3 · ad998d3
2 parents 0ad47e3 + 73a7926
commit ad998d3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/cmake/compilers/CXXFlags.cmake b/cmake/compilers/CXXFlags.cmake
@@ -31,9 +31,19 @@ if(NOT DEFINED DEFUALT_CXX_FLAGS_SET OR RESET_FLAGS)
   endif()
 
   if(CMAKE_CXX_COMPILER_ID MATCHES PGI)
-	  set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} -g")
-	  set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG} -O0")
-	  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
+      # Apparently PGI doesn't let you decide which standard to use...
+      # The main problem with PGI is compiling Eigen.
+      # Assertions have to be disabled (-DNDEBUG) and optimization level has to
+      # be low (-O1)
+      # It is impossible to compile and/or run tests otherwise!!!
+      set(CMAKE_CXX_FLAGS "-fPIC -DNDEBUG")
+      if(ENABLE_64BIT_INTEGERS)
+          set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
+      else()
+          set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+      endif()
+      set(CMAKE_CXX_FLAGS_DEBUG   "-g -O0")
+      set(CMAKE_CXX_FLAGS_RELEASE "-O1")
   endif()
 
   if(CMAKE_CXX_COMPILER_ID MATCHES XL)

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -38,6 +38,8 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES Clang)
   	set(cxxflags "${cxxflags} -stdlib=libc++")
 	set(linkflags "${linkflags} -stdlib=libc++")
   endif()	  
+elseif(CMAKE_CXX_COMPILER_ID MATCHES PGI)
+  set(toolset "pgi")
 else()
 	if(CMAKE_SYSTEM_NAME MATCHES Darwin)
 		set(toolset "darwin")

diff --git a/external/eigen3/include/eigen3/Eigen/src/Core/util/Memory.h b/external/eigen3/include/eigen3/Eigen/src/Core/util/Memory.h
@@ -63,7 +63,7 @@
 // Currently, let's include it only on unix systems:
 #if defined(__unix__) || defined(__unix)
   #include <unistd.h>
-  #if ((defined __QNXNTO__) || (defined _GNU_SOURCE) || ((defined _XOPEN_SOURCE) && (_XOPEN_SOURCE >= 600))) && (defined _POSIX_ADVISORY_INFO) && (_POSIX_ADVISORY_INFO > 0)
+  #if ((defined __QNXNTO__) || (defined _GNU_SOURCE) || (defined __PGI) || ((defined _XOPEN_SOURCE) && (_XOPEN_SOURCE >= 600))) && (defined _POSIX_ADVISORY_INFO) && (_POSIX_ADVISORY_INFO > 0)
     #define EIGEN_HAS_POSIX_MEMALIGN 1
   #endif
 #endif