Skip to content

Commit c51d598

Browse files
committed
Merge pull request #54 from zbeekman/broken-intel-build-sh-issue-53
Broken intel build.sh issue 53
2 parents 13ee59c + a152611 commit c51d598

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,10 @@ enable_testing()
162162
find_program ( JSONLINT jsonlint )
163163
find_program ( DIFF diff )
164164
set ( DATA_DIR ${CMAKE_BINARY_DIR}/files )
165-
configure_file ( ${CMAKE_SOURCE_DIR}/files/test1.json ${DATA_DIR}/test1.json COPYONLY )
166-
configure_file ( ${CMAKE_SOURCE_DIR}/files/test5.json ${DATA_DIR}/test5.json COPYONLY )
165+
configure_file ( ${CMAKE_SOURCE_DIR}/files/test1.json ${DATA_DIR}/test1.json COPYONLY )
166+
configure_file ( ${CMAKE_SOURCE_DIR}/files/test5.json ${DATA_DIR}/test5.json COPYONLY )
167+
configure_file ( ${CMAKE_SOURCE_DIR}/files/invalid.json ${DATA_DIR}/invalid.json COPYONLY )
168+
configure_file ( ${CMAKE_SOURCE_DIR}/files/invalid2.json ${DATA_DIR}/invalid2.json COPYONLY )
167169

168170
# Validate input
169171
if ( JSONLINT )

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ then
3232
# warning #7601: F2008 standard does not allow an internal procedure to be an actual argument procedure name. (R1214.4).
3333
# In the context of F2008 this is an erroneous warning.
3434
# See https://prd1idz.cps.intel.com/en-us/forums/topic/486629
35-
FCOMPILERFLAGS= '-c -O2 -warn -stand f08 -diag-disable 7601 -traceback'
35+
FCOMPILERFLAGS='-c -O2 -warn -stand f08 -diag-disable 7601 -traceback'
3636
#FCOMPILERFLAGS='-c -O2 -warn -traceback -stand f08 -assume protect_parens -assume buffered_io -check all'
3737

3838
else

0 commit comments

Comments
 (0)