Merge branch 'fix/gslib_dir' into 'master'

Made gs lib compile to a seperate directory

See merge request nektar/nektar!1145

CHANGELOG.md

@@ -5,7 +5,7 @@ v5.1.0
 ------
 **Library**
 - Restructure library to use local coefficient storage down to the GlobalLinSys
-  level. Removed GlobalCoeffs functionality (!963)
+  level. Removed GlobalCoeffs functionality (!963, !1145)
 - Add interior penalty method to DG framework (!1101)
 - Add an error filter for the time-evolution of the L2 and Linf errors (!1147)
 - Refactored time integration code using factory pattern (!1034)

cmake/ThirdPartyMPI.cmake

@@ -51,14 +51,14 @@ IF( NEKTAR_USE_MPI )
     IF (THIRDPARTY_BUILD_GSMPI)
         INCLUDE(ExternalProject)
         EXTERNALPROJECT_ADD(
-            gsmpi-1.2.1
+            gsmpi-1.2.1_2
             URL ${TPURL}/gsmpi-1.2.1_2.tar.bz2
             URL_MD5 3690b4a658324cd5ad17cf8f6115fb5d
             STAMP_DIR ${TPBUILD}/stamp
             DOWNLOAD_DIR ${TPSRC}
-            SOURCE_DIR ${TPSRC}/gsmpi-1.2.1
-            BINARY_DIR ${TPBUILD}/gsmpi-1.2.1
-            TMP_DIR ${TPBUILD}/gsmpi-1.2.1-tmp
+            SOURCE_DIR ${TPSRC}/gsmpi-1.2.1_2
+            BINARY_DIR ${TPBUILD}/gsmpi-1.2.1_2
+            TMP_DIR ${TPBUILD}/gsmpi-1.2.1_2-tmp
             INSTALL_DIR ${TPDIST}
             CONFIGURE_COMMAND
                 ${CMAKE_COMMAND}
@@ -67,7 +67,7 @@ IF( NEKTAR_USE_MPI )
                 -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
                 -DCMAKE_BUILD_TYPE:STRING=Debug
                 -DCMAKE_INSTALL_PREFIX:PATH=${TPDIST}
-                ${TPSRC}/gsmpi-1.2.1
+                ${TPSRC}/gsmpi-1.2.1_2
         )
         THIRDPARTY_LIBRARY(GSMPI_LIBRARY STATIC gsmpi DESCRIPTION "GSMPI Library")
         THIRDPARTY_LIBRARY(XXT_LIBRARY STATIC xxt DESCRIPTION "XXT Library")

library/LibUtilities/CMakeLists.txt

@@ -414,7 +414,7 @@ IF( NEKTAR_USE_MPI )
             PROPERTIES COMPILE_FLAGS "${THE_COMPILE_FLAGS} ${MPI_CXX_COMPILE_FLAGS}")
     ENDIF()
 
-    ADD_DEPENDENCIES(LibUtilities gsmpi-1.2.1)
+    ADD_DEPENDENCIES(LibUtilities gsmpi-1.2.1_2)
 
     IF (THIRDPARTY_BUILD_MPI)
         ADD_DEPENDENCIES(LibUtilities openmpi-1.10.3)