646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 3dd3e19..4290041 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -143,25 +143,6 @@ check_function_exists (strtoull HAVE_STRTOULL)
|
|
check_function_exists (strtoimax HAVE_STRTOIMAX)
|
|
check_function_exists (strtoumax HAVE_STRTOUMAX)
|
|
|
|
-set(ANTLR_JAR_FILENAME "antlr-4.13.2-complete.jar")
|
|
-get_filename_component(SOURCE_PARENT_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
|
|
-set(LINUX_RES_BIN_DIR ${SOURCE_PARENT_DIR}/linux-res/bin)
|
|
-message("WITH_ANTLR_JAR: ${WITH_ANTLR_JAR}")
|
|
-if(WITH_ANTLR_JAR)
|
|
- get_filename_component(ANTLR_JAR_USER_DIR ${WITH_ANTLR_JAR} DIRECTORY)
|
|
- find_path(ANTLR_JAR_PATH ${ANTLR_JAR_FILENAME} ${LINUX_RES_BIN_DIR} ${ANTLR_JAR_USER_DIR})
|
|
-else(WITH_ANTLR_JAR)
|
|
- find_path(ANTLR_JAR_PATH ${ANTLR_JAR_FILENAME} ${LINUX_RES_BIN_DIR})
|
|
-endif(WITH_ANTLR_JAR)
|
|
-
|
|
-if(ANTLR_JAR_PATH AND Java_JAVA_EXECUTABLE)
|
|
- set(ANTLR_JAR_PATH ${ANTLR_JAR_PATH}/${ANTLR_JAR_FILENAME})
|
|
- message(STATUS "ANTLR jar: " ${ANTLR_JAR_PATH})
|
|
-else()
|
|
- message(WARNING ${ANTLR_JAR_FILENAME} " or java runtime wasn't found which is required if you'd like to rebuild Lexer and Parser files")
|
|
-endif()
|
|
-
|
|
-
|
|
if (UNIX)
|
|
if (NOT LIB_INSTALL_DIR)
|
|
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
|