Skip to content

Commit 61e8e5b

Browse files
committed
Revert "jsonfortran: add UTF8 feature check"
This reverts commit 12ba73a.
1 parent 12ba73a commit 61e8e5b

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

cmake/compilers.cmake

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
include(CheckSourceCompiles)
2-
# Compiler capability test
3-
check_source_compiles(Fortran
4-
"program test
5-
character(kind=selected_char_kind('ISO_10646')) :: c
6-
end program"
7-
HAS_Fortran_UTF8
8-
)
9-
101
# compiler flags for gfortran
112
if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
123

cmake/json.cmake

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ ${_src}/json_module.F90
2323
)
2424

2525
add_library(jsonfortran ${JF_LIB_SRCS})
26-
target_compile_definitions(jsonfortran PRIVATE
27-
${JSON_REAL_KIND} ${JSON_INT_KIND}
28-
$<$<BOOL:${HAS_Fortran_UTF8}>:USE_UCS4>
29-
)
26+
target_compile_definitions(jsonfortran PRIVATE ${JSON_REAL_KIND} ${JSON_INT_KIND})
3027
target_include_directories(jsonfortran PUBLIC
3128
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>
3229
$<INSTALL_INTERFACE:include>

0 commit comments

Comments
 (0)