Commit 73150cfe authored by LEFEBVREJP email's avatar LEFEBVREJP email
Browse files

Merge branch 'sparsegrids_f90' into 'master'

Changing check in radixsparsegrid from BUILD_SHARED_LIBS to NOT Windows.

See merge request !74
parents 22a731dc 1e7ae39c
Pipeline #57765 passed with stages
in 14 minutes and 18 seconds
......@@ -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
......
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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment