Skip to content

Commit 54e596e

Browse files
committed
Don't attempt to build languages in unittests
1 parent 321d51a commit 54e596e

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

.github/workflows/compilation.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ jobs:
6565
-DUSE_TESTS=On \
6666
-DUSE_SANITIZERS=On \
6767
-DUSE_TOOLS=On \
68+
-DBUILD_LANGUAGES=Off \
6869
..
6970
make -j $(getconf _NPROCESSORS_ONLN)
7071

CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ OPTION(USE_TOOLS "Build tools" OFF)
1616
OPTION(USE_SANITIZERS "Enable Asan and Ubsan" OFF)
1717
OPTION(USE_TIDY "Use clang-tidy for checks" OFF)
1818
OPTION(USE_FORMAT "Use clang-format for checks" OFF)
19+
OPTION(BUILD_LANGUAGES "Build Language Files" ON)
1920

2021
set(USE_PCH ON)
2122
# clang-tidy only works with clang when PCH is enabled
@@ -238,9 +239,10 @@ add_dependencies(openomf copy_shaders)
238239

239240
# Build tools if requested
240241
set(TOOL_TARGET_NAMES)
241-
# always build languagetool, for BuildLanguages.cmake
242-
add_executable(languagetool tools/languagetool/main.c)
243-
list(APPEND TOOL_TARGET_NAMES languagetool)
242+
if(BUILD_LANGUAGES OR USE_TOOLS)
243+
add_executable(languagetool tools/languagetool/main.c)
244+
list(APPEND TOOL_TARGET_NAMES languagetool)
245+
endif()
244246
if (USE_TOOLS)
245247
add_executable(bktool tools/bktool/main.c
246248
tools/shared/animation_misc.c

cmake-scripts/BuildLanguages.cmake

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ file(WRITE "${BASE_TXT}" "${BASETXT_CONTENTS}")
4444
message(STATUS "BuildLanguages LANG2_STR_COUNT: ${LANG2_STR_COUNT}")
4545

4646

47+
48+
if(NOT BUILD_LANGUAGES)
49+
# early out, having written generated_languages.h
50+
return()
51+
endif()
52+
53+
4754
if(WIN32)
4855
set(LANGUAGE_INSTALL_PATH "openomf/resources/")
4956
else()
@@ -58,7 +65,7 @@ foreach(LANG ${OMF_LANGS})
5865
set(LNG "${CMAKE_CURRENT_BINARY_DIR}/resources/${LANG}.LNG")
5966
find_file("${LANG}_DAT" "${LANG}.DAT" PATHS "${CMAKE_CURRENT_BINARY_DIR}/resources" "${PROJECT_SOURCE_DIR}/resources" REQUIRED)
6067
set(BASE_DAT "${${LANG}_DAT}")
61-
list(APPEND BUILD_LANG_SORUCES "${TXT2}")
68+
list(APPEND BUILD_LANG_SOURCES "${TXT2}")
6269
list(APPEND BUILD_LANG_COMMANDS
6370
DEPENDS "${TXT2}"
6471
BYPRODUCTS "${LNG}"
@@ -72,7 +79,7 @@ foreach(LANG ${OPENOMF_LANGS})
7279
set(TXT2 "${PROJECT_SOURCE_DIR}/resources/${LANG}2.TXT")
7380
set(DAT "${CMAKE_CURRENT_BINARY_DIR}/resources/${LANG}.DAT")
7481
set(LNG "${CMAKE_CURRENT_BINARY_DIR}/resources/${LANG}.LNG")
75-
list(APPEND BUILD_LANG_SORUCES "${TXT}" "${TXT2}")
82+
list(APPEND BUILD_LANG_SOURCES "${TXT}" "${TXT2}")
7683
list(APPEND BUILD_LANG_COMMANDS
7784
DEPENDS "${TXT}" "${TXT2}"
7885
BYPRODUCTS "${DAT}" "{LNG}"
@@ -91,6 +98,6 @@ add_custom_target(build_languages
9198
${BUILD_LANG_COMMANDS}
9299
COMMAND ${CMAKE_COMMAND} -E echo "done"
93100
)
94-
target_sources(build_languages PRIVATE ${BUILD_LANG_SORUCES})
101+
target_sources(build_languages PRIVATE ${BUILD_LANG_SOURCES})
95102
add_dependencies(openomf build_languages)
96103
add_dependencies(build_languages languagetool)

0 commit comments

Comments
 (0)