Skip to content

Commit

Permalink
fixed CMakeLists.txt files to fix broken build process on Linux (#54)
Browse files Browse the repository at this point in the history
  • Loading branch information
iwsfutcmd authored and brawer committed Apr 11, 2019
1 parent 031b0d8 commit 4d35528
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 31 deletions.
14 changes: 7 additions & 7 deletions src/fonttest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ add_executable(fonttest
tehreerstack_engine.cpp
tehreerstack_line.cpp
test_harness.cpp
$<IF:${APPLE},coretext_engine.mm,>
$<IF:${APPLE},coretext_font.mm,>
$<IF:${APPLE},coretext_line.mm,>
$<IF:${APPLE},coretext_path.mm,>
$<IF:$<BOOL:${APPLE}>,coretext_engine.mm,>
$<IF:$<BOOL:${APPLE}>,coretext_font.mm,>
$<IF:$<BOOL:${APPLE}>,coretext_line.mm,>
$<IF:$<BOOL:${APPLE}>,coretext_path.mm,>
)

set_target_properties(fonttest PROPERTIES
Expand Down Expand Up @@ -53,7 +53,7 @@ endif(APPLE)

target_link_libraries(fonttest
freetype harfbuzz raqm sheenbidi sheenfigure
$<IF:${APPLE},${Foundation},>
$<IF:${APPLE},${CoreGraphics},>
$<IF:${APPLE},${CoreText},>
$<IF:$<BOOL:${APPLE}>,${Foundation},>
$<IF:$<BOOL:${APPLE}>,${CoreGraphics},>
$<IF:$<BOOL:${APPLE}>,${CoreText},>
)
10 changes: 5 additions & 5 deletions src/third_party/fribidi/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ check_type_size(wchar_t SIZEOF_WCHAR_T)

target_compile_definitions(fribidi
PRIVATE HAVE_STRINGIZE
$<IF:${HAVE_STDLIB_H},HAVE_STDLIB_H,>
$<IF:${HAVE_STRING_H},HAVE_STRING_H,>
$<IF:${HAVE_STRINGS_H},HAVE_STRINGS_H,>
$<IF:${HAVE_WCHAR_H},HAVE_WCHAR_H,>
$<IF:${HAVE_SYS_TIMES_H},HAVE_SYS_TIMES_H,>
$<IF:$<BOOL:${HAVE_STDLIB_H}>,HAVE_STDLIB_H,>
$<IF:$<BOOL:${HAVE_STRING_H}>,HAVE_STRING_H,>
$<IF:$<BOOL:${HAVE_STRINGS_H}>,HAVE_STRINGS_H,>
$<IF:$<BOOL:${HAVE_WCHAR_H}>,HAVE_WCHAR_H,>
$<IF:$<BOOL:${HAVE_SYS_TIMES_H}>,HAVE_SYS_TIMES_H,>
)

target_include_directories(fribidi SYSTEM
Expand Down
20 changes: 10 additions & 10 deletions src/third_party/harfbuzz/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,14 @@ target_compile_definitions(harfbuzz
PRIVATE HAVE_FREETYPE HAVE_OT HAVE_UCDN
HAVE_FT_GET_VAR_BLEND_COORDINATES
HAVE_INTEL_ATOMIC_PRIMITIVES
$<IF:${HAVE_ATEXIT},HAVE_ATEXIT,>
$<IF:${HAVE_GETPAGESIZE},HAVE_GETPAGESIZE,>
$<IF:${HAVE_MMAP},HAVE_MMAP,>
$<IF:${HAVE_MPROTECT},HAVE_MPROTECT,>
$<IF:${HAVE_ROUND},HAVE_ROUND,>
$<IF:${HAVE_SYSCONF},HAVE_SYSCONF,>
$<IF:${HAVE_SYS_MMAN_H},HAVE_SYS_MMAN_H,>
$<IF:${HAVE_SYS_STAT_H},HAVE_SYS_STAT_H,>
$<IF:${HAVE_SYS_TYPES_H},HAVE_SYS_TYPES_H,>
$<IF:${HAVE_UNISTD_H},HAVE_UNISTD_H,>
$<IF:$<BOOL:${HAVE_ATEXIT}>,HAVE_ATEXIT,>
$<IF:$<BOOL:${HAVE_GETPAGESIZE}>,HAVE_GETPAGESIZE,>
$<IF:$<BOOL:${HAVE_MMAP}>,HAVE_MMAP,>
$<IF:$<BOOL:${HAVE_MPROTECT}>,HAVE_MPROTECT,>
$<IF:$<BOOL:${HAVE_ROUND}>,HAVE_ROUND,>
$<IF:$<BOOL:${HAVE_SYSCONF}>,HAVE_SYSCONF,>
$<IF:$<BOOL:${HAVE_SYS_MMAN_H}>,HAVE_SYS_MMAN_H,>
$<IF:$<BOOL:${HAVE_SYS_STAT_H}>,HAVE_SYS_STAT_H,>
$<IF:$<BOOL:${HAVE_SYS_TYPES_H}>,HAVE_SYS_TYPES_H,>
$<IF:$<BOOL:${HAVE_UNISTD_H}>,HAVE_UNISTD_H,>
)
18 changes: 9 additions & 9 deletions src/third_party/raqm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ target_compile_definitions(raqm
HAVE_DECL_HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES
HAVE_HB_BUFFER_SET_INVISIBLE_GLYPH
HAVE_HB_FT_FONT_SET_LOAD_FLAGS
$<IF:${HAVE_INTTYPES_H},HAVE_INTTYPES_H,>
$<IF:${HAVE_MEMORY_H},HAVE_MEMORY_H,>
$<IF:${HAVE_STDINT_H},HAVE_STDINT_H,>
$<IF:${HAVE_STDLIB_H},HAVE_STDLIB_H,>
$<IF:${HAVE_STRING_H},HAVE_STRING_H,>
$<IF:${HAVE_STRINGS_H},HAVE_STRINGS_H,>
$<IF:${HAVE_SYS_STAT_H},HAVE_SYS_STAT_H,>
$<IF:${HAVE_SYS_TYPES_H},HAVE_SYS_TYPES_H,>
$<IF:${HAVE_UNISTD_H},HAVE_UNISTD_H,>
$<IF:$<BOOL:${HAVE_INTTYPES_H}>,HAVE_INTTYPES_H,>
$<IF:$<BOOL:${HAVE_MEMORY_H}>,HAVE_MEMORY_H,>
$<IF:$<BOOL:${HAVE_STDINT_H}>,HAVE_STDINT_H,>
$<IF:$<BOOL:${HAVE_STDLIB_H}>,HAVE_STDLIB_H,>
$<IF:$<BOOL:${HAVE_STRING_H}>,HAVE_STRING_H,>
$<IF:$<BOOL:${HAVE_STRINGS_H}>,HAVE_STRINGS_H,>
$<IF:$<BOOL:${HAVE_SYS_STAT_H}>,HAVE_SYS_STAT_H,>
$<IF:$<BOOL:${HAVE_SYS_TYPES_H}>,HAVE_SYS_TYPES_H,>
$<IF:$<BOOL:${HAVE_UNISTD_H}>,HAVE_UNISTD_H,>
)

target_include_directories(raqm SYSTEM
Expand Down

0 comments on commit 4d35528

Please sign in to comment.