Merge pull request #41 from Goddard-Fortran-Ecosystem/develop

Develop
Goddard-Fortran-Ecosystem · Feb 5, 2019 · 4e2e5cd · 4e2e5cd
2 parents bd1c780 + 57cae98
commit 4e2e5cd
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 36 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,10 @@ endif(COMMAND cmake_policy)
 set(PFUNIT "" CACHE PATH "(optional) path to installed testing framework")
 if (PFUNIT)
   set(CMAKE_Fortran_COMPILER ${FC})
-  project (gFTL Fortran)
+  project (gFTL
+    VERSION 1.01
+    LANGUAGES Fortran
+    )
 
   set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_utils")
   include(${CMAKE_Fortran_COMPILER_ID} RESULT_VARIABLE found)
@@ -15,7 +18,8 @@ if (PFUNIT)
 else ()
   project (gFTL
     VERSION 1.0.1
-    LANGUAGES NONE)
+    LANGUAGES NONE
+    )
 endif()
 
 add_subdirectory(include)

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory (templates)
 add_subdirectory (types)
 
-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION .  FILES_MATCHING PATTERN "*.inc")
+file (COPY DIRECTORY . DESTINATION . FILES_MATCHING PATTERN "*.inc")
 install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DESTINATION .  FILES_MATCHING PATTERN "*.inc")
diff --git a/include/templates/CMakeLists.txt b/include/templates/CMakeLists.txt
@@ -39,5 +39,6 @@ add_custom_target( template_macros ALL
   DEPENDS ${depends}
   )
 
+file (COPY DIRECTORY . DESTINATION . FILES_MATCHING PATTERN "*.inc")
 
 
diff --git a/include/types/CMakeLists.txt b/include/types/CMakeLists.txt
@@ -61,3 +61,5 @@ endforeach ()
 add_custom_target (types ALL
   DEPENDS ${depends}
   )
+
+file (COPY DIRECTORY . DESTINATION . FILES_MATCHING PATTERN "*.inc")
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -14,8 +14,8 @@ include_directories (${PFUNIT}/mod)
 link_directories (${PFUNIT}/lib)
 
 include_directories (${CMAKE_CURRENT_SOURCE_DIR})
-include_directories (${FTL_SOURCE_DIR}/tests/shared)
-include_directories (${FTL_BINARY_DIR}/tests/shared)
+include_directories (${gFTL_SOURCE_DIR}/tests/shared)
+include_directories (${gFTL_BINARY_DIR}/tests/shared)
 
 include_directories (${CMAKE_CURRENT_BINARY_DIR}/Set)
 include_directories (${CMAKE_CURRENT_BINARY_DIR}/altSet)

diff --git a/tests/Map/CMakeLists.txt b/tests/Map/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 include_directories (${CMAKE_CURRENT_BINARY_DIR}/SUT)
 
 
-include_directories(${FTL_BINARY_DIR}/tests/shared)
+include_directories(${gFTL_BINARY_DIR}/tests/shared)
 file(RELATIVE_PATH INCLUDE_RELATIVE_PATH_BIN
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_BINARY_DIR}/.)

diff --git a/tests/Map/SUT/CMakeLists.txt b/tests/Map/SUT/CMakeLists.txt
@@ -34,9 +34,9 @@ set (instantiations
   "deferredLengthString\;deferredLengthString\;free"
 )
 
-include_directories(${FTL_BINARY_DIR}/tests/shared)
-include_directories (${FTL_SOURCE_DIR}/include)
-include_directories (${FTL_BINARY_DIR}/include)
+include_directories(${gFTL_BINARY_DIR}/tests/shared)
+include_directories (${gFTL_SOURCE_DIR}/include)
+include_directories (${gFTL_BINARY_DIR}/include)
 include_directories (${PFUNIT}/mod)
 
 

diff --git a/tests/Set/CMakeLists.txt b/tests/Set/CMakeLists.txt
@@ -6,16 +6,16 @@ include_directories (${PFUNIT}/mod)
 link_directories(${PFUNIT}/lib)
 
 include_directories (${CMAKE_CURRENT_SOURCE_DIR})
-include_directories (${FTL_BINARY_DIR}/tests/shared)
+include_directories (${gFTL_BINARY_DIR}/tests/shared)
 
-include_directories (${FTL_SOURCE_DIR}/include)
-include_directories (${FTL_BINARY_DIR}/include)
+include_directories (${gFTL_SOURCE_DIR}/include)
+include_directories (${gFTL_BINARY_DIR}/include)
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
 include_directories (${CMAKE_CURRENT_BINARY_DIR}/SUT)
 
 
 
-include_directories(${FTL_BINARY_DIR}/tests/shared)
+include_directories(${gFTL_BINARY_DIR}/tests/shared)
 # Use relative paths for includes so that CMake correctly
 # detects the need to generate include files.
 file(RELATIVE_PATH INCLUDE_RELATIVE_PATH_BIN

diff --git a/tests/Set/SUT/CMakeLists.txt b/tests/Set/SUT/CMakeLists.txt
@@ -1,8 +1,8 @@
 include_directories (${PFUNIT}/mod)
 
-include_directories (${FTL_SOURCE_DIR}/include)
-include_directories (${FTL_BINARY_DIR}/include)
-include_directories (${FTL_BINARY_DIR}/tests/shared)
+include_directories (${gFTL_SOURCE_DIR}/include)
+include_directories (${gFTL_BINARY_DIR}/include)
+include_directories (${gFTL_BINARY_DIR}/tests/shared)
 
 set (instantiations
 

diff --git a/tests/Vector/CMakeLists.txt b/tests/Vector/CMakeLists.txt
@@ -5,12 +5,12 @@ include_directories  (${PFUNIT}/mod)
 link_directories (${PFUNIT}/lib)
 
 include_directories  (${CMAKE_CURRENT_SOURCE_DIR})
-include_directories  (${FTL_SOURCE_DIR}/include)
+include_directories  (${gFTL_SOURCE_DIR}/include)
 include_directories  (${CMAKE_CURRENT_SOURCE_DIR}/include)
-include_directories  (${FTL_BINARY_DIR}/include)
-include_directories  (${FTL_BINARY_DIR}/mod)
+include_directories  (${gFTL_BINARY_DIR}/include)
+include_directories  (${gFTL_BINARY_DIR}/mod)
 include_directories  (${CMAKE_CURRENT_BINARY_DIR}/SUT)
-include_directories (${FTL_BINARY_DIR}/tests/shared)
+include_directories (${gFTL_BINARY_DIR}/tests/shared)
 
 file (RELATIVE_PATH INCLUDE_RELATIVE_PATH_BIN
      ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/tests/Vector/SUT/CMakeLists.txt b/tests/Vector/SUT/CMakeLists.txt
@@ -1,9 +1,9 @@
-include_directories (${FTL_SOURCE_DIR}/include)
-include_directories (${FTL_BINARY_DIR}/include)
+include_directories (${gFTL_SOURCE_DIR}/include)
+include_directories (${gFTL_BINARY_DIR}/include)
 include_directories (${PFUNIT}/mod)
-include_directories (${FTL_BINARY_DIR}/mod)
-include_directories(${FTL_BINARY_DIR}/tests/shared)
-include_directories(${FTL_SOURCE_DIR}/include)
+include_directories (${gFTL_BINARY_DIR}/mod)
+include_directories(${gFTL_BINARY_DIR}/tests/shared)
+include_directories(${gFTL_SOURCE_DIR}/include)
 
 set(src ${CMAKE_CURRENT_SOURCE_DIR})
 set(bin ${CMAKE_CURRENT_BINARY_DIR})

diff --git a/tests/Vector/vectorSUT/CMakeLists.txt b/tests/Vector/vectorSUT/CMakeLists.txt
@@ -17,7 +17,7 @@ set (SRCS
 
 set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -O0 -traceback -assume realloc_lhs")
 
-include_directories (${FTL_SOURCE_DIR}/include)
+include_directories (${gFTL_SOURCE_DIR}/include)
 include_directories (${PFUNIT}/mod)
 
 add_library(vectorSUT STATIC ${SRCS})
diff --git a/tests/altSet/CMakeLists.txt b/tests/altSet/CMakeLists.txt
@@ -6,16 +6,16 @@ include_directories (${PFUNIT}/mod)
 link_directories(${PFUNIT}/lib)
 
 include_directories (${CMAKE_CURRENT_SOURCE_DIR})
-include_directories (${FTL_BINARY_DIR}/tests/shared)
+include_directories (${gFTL_BINARY_DIR}/tests/shared)
 
-include_directories (${FTL_SOURCE_DIR}/include)
-include_directories (${FTL_BINARY_DIR}/include)
+include_directories (${gFTL_SOURCE_DIR}/include)
+include_directories (${gFTL_BINARY_DIR}/include)
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
 include_directories (${CMAKE_CURRENT_BINARY_DIR}/SUT)
 
 
 
-include_directories(${FTL_BINARY_DIR}/tests/shared)
+include_directories(${gFTL_BINARY_DIR}/tests/shared)
 # Use relative paths for includes so that CMake correctly
 # detects the need to generate include files.
 file(RELATIVE_PATH INCLUDE_RELATIVE_PATH_BIN

diff --git a/tests/altSet/SUT/CMakeLists.txt b/tests/altSet/SUT/CMakeLists.txt
@@ -1,8 +1,8 @@
 include_directories (${PFUNIT}/mod)
 
-include_directories (${FTL_SOURCE_DIR}/include)
-include_directories (${FTL_BINARY_DIR}/include)
-include_directories (${FTL_BINARY_DIR}/tests/shared)
+include_directories (${gFTL_SOURCE_DIR}/include)
+include_directories (${gFTL_BINARY_DIR}/include)
+include_directories (${gFTL_BINARY_DIR}/tests/shared)
 
 set (instantiations
 

diff --git a/tests/shared/CMakeLists.txt b/tests/shared/CMakeLists.txt
@@ -4,9 +4,8 @@ set (SRCS
   pFUnitSupplement.F90
 )
 
-include_directories (${FTL_SOURCE_DIR}/include)
-include_directories (${FTL_BINARY_DIR}/include)
-#include_directories (${FTL_BINARY_DIR}/mod)
+include_directories (${gFTL_SOURCE_DIR}/include)
+include_directories (${gFTL_BINARY_DIR}/include)
 include_directories (${PFUNIT}/mod)
 
 add_library(shared ${SRCS})