Skip to content

Commit 0e417c9

Browse files
committed
Handle CMakeLists without Objective-C
1 parent 812511f commit 0e417c9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

vm/tests/src/test/java/com/codename1/tools/translator/CleanTargetIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ static void replaceLibraryWithExecutableTarget(Path cmakeLists, String sourceDir
183183
String globWithObjc = String.format("file(GLOB TRANSLATOR_SOURCES \"%s/*.c\" \"%s/*.m\")", sourceDirName, sourceDirName);
184184
String globCOnly = String.format("file(GLOB TRANSLATOR_SOURCES \"%s/*.c\")", sourceDirName);
185185
content = content.replace(globWithObjc, globCOnly);
186-
content = content.replace(" LANGUAGES C OBJC", " LANGUAGES C");
187-
content = content.replace("enable_language(OBJC OPTIONAL)\n", "");
186+
content = content.replaceAll("LANGUAGES\\s+C\\s+OBJC", "LANGUAGES C");
187+
content = content.replaceAll("(?m)^enable_language\\(OBJC OPTIONAL\\)\\s*$\\n?", "");
188188
String replacement = content.replace(
189189
"add_library(${PROJECT_NAME} ${TRANSLATOR_SOURCES} ${TRANSLATOR_HEADERS})",
190190
"add_executable(${PROJECT_NAME} ${TRANSLATOR_SOURCES} ${TRANSLATOR_HEADERS})\ntarget_link_libraries(${PROJECT_NAME} m pthread)"

0 commit comments

Comments
 (0)