Reduced number of warning messages.

NAG was generating many warnings in verification tests due to long paths that resulted in CPP lines longer than 132 columns. Changes to CMakeLists.txt minimize this. (Deactivated previous change to use relative paths - that apparently was unnecessary or at least no longer necessary.) Still have a few more warnings to suppress.
Goddard-Fortran-Ecosystem · Jan 29, 2018 · d96a8bd · d96a8bd
1 parent 17d7c40
commit d96a8bd
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 36 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,11 @@ set(PFUNIT "" CACHE PATH "(optional) path to installed testing framework")
 if (PFUNIT)
   set(CMAKE_Fortran_COMPILER ${FC})
   project (FTL Fortran)
-  include(cmake_utils/${CMAKE_Fortran_COMPILER_ID}.cmake RESULT_VARIABLE found)
+
+  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_utils")
+  include(${CMAKE_Fortran_COMPILER_ID} RESULT_VARIABLE found)
+  include(CheckFortranSource)
+  include(CheckCompilerCapabilities)
 else ()
   project (FTL NONE)
 endif()

diff --git a/cmake_utils/CheckFortranSource.cmake b/cmake_utils/CheckFortranSource.cmake
@@ -96,7 +96,6 @@ macro (CHECK_Fortran_SOURCE_COMPILE file var)
 
 endmacro (CHECK_Fortran_SOURCE_COMPILE)
 
-
 macro (CHECK_Fortran_SOURCE_RUN file var)
 
   if (NOT CMAKE_REQUIRED_QUIET)

diff --git a/include/templates/altSet_impl.inc b/include/templates/altSet_impl.inc
@@ -676,7 +676,7 @@
       integer, intent(in) :: side
 
       integer(kind=SIZE_KIND) :: parent, other, child0, child1,           &
-     &      otherchild, otherparent, tmp
+     &      otherchild, otherparent
 
       parent = this%parents%at(pos)
       other = pos
@@ -713,8 +713,6 @@
         call this%rebalance(otherparent, .false.)
       endif
 
-      tmp = this%items%size()
-
       ! declare this space available
       call this%parents%set(pos, this%next_free)
       this%next_free = pos

diff --git a/include/templates/vector_impl.inc b/include/templates/vector_impl.inc
@@ -473,7 +473,9 @@
 
          integer(kind=SIZE_KIND) :: oldSize
          integer(kind=SIZE_KIND) :: i
-
+
+         _UNUSED_DUMMY(unused)
+
          if (newSize == this%vsize) return
          if (newSize < 0) then
             if (present(rc)) rc = ILLEGAL_INPUT

diff --git a/tests/Map/SUT/CMakeLists.txt b/tests/Map/SUT/CMakeLists.txt
@@ -55,9 +55,6 @@ foreach (instantiation ${instantiations})
      set (outfile ${key}${value}Map.F)
   endif ()
 
-  # Use relative path for outfile so that CMake correctly
-  # detects the need to generate include files.
-
   add_custom_command (
     OUTPUT ${outfile}
     COMMAND m4 -s -Dkey=${key} -DALT -Dvalue=${value} -Dformat=${format} < ${infile} > ${outfile}

diff --git a/tests/Set/SUT/CMakeLists.txt b/tests/Set/SUT/CMakeLists.txt
@@ -1,16 +1,7 @@
 include_directories (${PFUNIT}/mod)
 
-# Use relative paths for includes so that CMake correctly
-# detects the need to generate include files.
-file(RELATIVE_PATH INCLUDE_RELATIVE_PATH_SRC
-     ${CMAKE_CURRENT_SOURCE_DIR}
-     ${CMAKE_SOURCE_DIR}/.)
-file(RELATIVE_PATH INCLUDE_RELATIVE_PATH_BIN
-     ${CMAKE_CURRENT_SOURCE_DIR}
-     ${CMAKE_BINARY_DIR}/.)
-
-include_directories (${INCLUDE_RELATIVE_PATH_SRC}/include)
-include_directories (${INCLUDE_RELATIVE_PATH_BIN}/include)
+include_directories (${FTL_SOURCE_DIR}/include)
+include_directories (${FTL_BINARY_DIR}/include)
 include_directories (${FTL_BINARY_DIR}/tests/shared)
 
 set (instantiations

diff --git a/tests/Vector/SUT/CMakeLists.txt b/tests/Vector/SUT/CMakeLists.txt
@@ -3,10 +3,7 @@ include_directories (${FTL_BINARY_DIR}/include)
 include_directories (${PFUNIT}/mod)
 include_directories (${FTL_BINARY_DIR}/mod)
 include_directories(${FTL_BINARY_DIR}/tests/shared)
-file(RELATIVE_PATH INCLUDE_RELATIVE_PATH_BIN
-     ${CMAKE_CURRENT_SOURCE_DIR}
-     ${CMAKE_BINARY_DIR}/.)
-include_directories(${INCLUDE_RELATIVE_PATH_BIN}/include)
+include_directories(${FTL_SOURCE_DIR}/include)
 
 set(src ${CMAKE_CURRENT_SOURCE_DIR})
 set(bin ${CMAKE_CURRENT_BINARY_DIR})
@@ -44,7 +41,6 @@ set (instantiations
 
 if (SUPPORT_FOR_POINTERS_TO_FIXED_LENGTH_STRINGS)
   LIST (APPEND instantiations "character17\;free")
-  message("***************")
 endif ()
 
 set (SRCS)

diff --git a/tests/altSet/SUT/CMakeLists.txt b/tests/altSet/SUT/CMakeLists.txt
@@ -1,16 +1,7 @@
 include_directories (${PFUNIT}/mod)
 
-# Use relative paths for includes so that CMake correctly
-# detects the need to generate include files.
-file(RELATIVE_PATH INCLUDE_RELATIVE_PATH_SRC
-     ${CMAKE_CURRENT_SOURCE_DIR}
-     ${CMAKE_SOURCE_DIR}/.)
-file(RELATIVE_PATH INCLUDE_RELATIVE_PATH_BIN
-     ${CMAKE_CURRENT_SOURCE_DIR}
-     ${CMAKE_BINARY_DIR}/.)
-
-include_directories (${INCLUDE_RELATIVE_PATH_SRC}/include)
-include_directories (${INCLUDE_RELATIVE_PATH_BIN}/include)
+include_directories (${FTL_SOURCE_DIR}/include)
+include_directories (${FTL_BINARY_DIR}/include)
 include_directories (${FTL_BINARY_DIR}/tests/shared)
 
 set (instantiations
Original file line number	Diff line number	Diff line change
Expand Up		@@ -96,7 +96,6 @@ macro (CHECK_Fortran_SOURCE_COMPILE file var)

		endmacro (CHECK_Fortran_SOURCE_COMPILE)


		macro (CHECK_Fortran_SOURCE_RUN file var)

		if (NOT CMAKE_REQUIRED_QUIET)
Expand Down