Skip to content

Commit 039de15

Browse files
StarGate01andreww
authored andcommitted
Fix cmake defines
1 parent 63a945a commit 039de15

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

CMakeLists.txt

-5
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,5 @@ ELSE()
196196
SET_PROPERTY(GLOBAL PROPERTY INCLUDE_DIRECTORIES ${NEW_INCLUDE_DIRS})
197197
ENDIF()
198198

199-
# supress warnings
200-
IF(${PROJECT_NAME}_SUPPRESS_WARNINGS)
201-
ADD_DEFINITIONS(-DSUPPRESS_WARNINGS)
202-
ENDIF()
203-
204199
# install modules
205200
INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/ DESTINATION include)

common/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,8 @@ set(fox_common_srcs_pp
1919
m_common_struct.F90
2020
)
2121

22+
IF(${PROJECT_NAME}_SUPPRESS_WARNINGS)
23+
ADD_DEFINITIONS(-DSUPPRESS_WARNINGS)
24+
ENDIF()
25+
2226
MK_LIBS(common utils fsys)

common/m_common_error.F90

+4-4
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ subroutine FoX_warning_base(msg)
7777
write(0,'(a)') 'FoX warning made fatal'
7878
call FoX_fatal_base(msg)
7979
endif
80-
#ifndef SUPPRESS_WARNINGS
81-
write(0,'(a)') 'WARNING(FoX)'
82-
write(0,'(a)') msg
83-
call pxfflush(0)
80+
#if !defined(SUPPRESS_WARNINGS)
81+
write(0,'(a)') 'WARNING(FoX)'
82+
write(0,'(a)') msg
83+
call pxfflush(0)
8484
#endif
8585

8686
end subroutine FoX_warning_base

0 commit comments

Comments
 (0)