Merge branch 'master' of code.ornl.gov:jap/radix

radixsparsegrids/CMakeLists.txt

@@ -14,7 +14,7 @@ SET(CXXHDR
 
 SET(CXXLIB ${SUBPACKAGE_FULLNAME})
 TRIBITS_ADD_LIBRARY(${CXXLIB} SOURCES ${CXXSRC} NOINSTALLHEADERS ${CXXHDR})
-IF(${PROJECT_NAME}_ENABLE_Fortran AND NOT BUILD_SHARED_LIBS)
+IF(${PROJECT_NAME}_ENABLE_Fortran AND NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows"))
   ADD_COMPILE_OPTIONS("-ffree-line-length-none")
   SET(F90SRC
     sparsegrids_I.f90

radixsparsegrids/tests/CMakeLists.txt

 INCLUDE(SetDefault)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/..)
 
-IF(${PROJECT_NAME}_ENABLE_Fortran AND NOT BUILD_SHARED_LIBS)
+IF(${PROJECT_NAME}_ENABLE_Fortran AND NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows"))
   SET(FTESTS)
   LIST(APPEND FTESTS
     tstConstrainedSparseGrids.f90