2019-03-08 22:09:33 -08:00
|
|
|
diff -urN a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
|
2020-10-17 18:01:36 +09:00
|
|
|
--- a/runtime/CMakeLists.txt
|
|
|
|
+++ b/runtime/CMakeLists.txt
|
2019-03-08 22:09:33 -08:00
|
|
|
@@ -25,7 +25,7 @@
|
|
|
|
add_library(antlr4_shared SHARED ${libantlrcpp_SRC})
|
|
|
|
add_library(antlr4_static STATIC ${libantlrcpp_SRC})
|
2020-10-17 18:01:36 +09:00
|
|
|
|
2019-03-08 22:09:33 -08:00
|
|
|
-set(LIB_OUTPUT_DIR "${CMAKE_HOME_DIRECTORY}/dist") # put generated libraries here.
|
|
|
|
+# set(LIB_OUTPUT_DIR "${CMAKE_HOME_DIRECTORY}/dist") # put generated libraries here.
|
|
|
|
message(STATUS "Output libraries to ${LIB_OUTPUT_DIR}")
|
2020-10-17 18:01:36 +09:00
|
|
|
|
2019-03-08 22:09:33 -08:00
|
|
|
# make sure 'make' works fine even if ${LIB_OUTPUT_DIR} is deleted.
|
2020-10-17 18:01:36 +09:00
|
|
|
@@ -63,15 +63,15 @@
|
2019-03-08 22:09:33 -08:00
|
|
|
set(extra_share_compile_flags "-DANTLR4CPP_EXPORTS")
|
|
|
|
set(extra_static_compile_flags "-DANTLR4CPP_STATIC")
|
|
|
|
endif(WIN32)
|
2020-10-17 18:01:36 +09:00
|
|
|
-if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
|
|
|
|
- if(WITH_STATIC_CRT)
|
|
|
|
- target_compile_options(antlr4_shared PRIVATE "/MT$<$<CONFIG:Debug>:d>")
|
|
|
|
- target_compile_options(antlr4_static PRIVATE "/MT$<$<CONFIG:Debug>:d>")
|
|
|
|
- else()
|
|
|
|
- target_compile_options(antlr4_shared PRIVATE "/MD$<$<CONFIG:Debug>:d>")
|
|
|
|
- target_compile_options(antlr4_static PRIVATE "/MD$<$<CONFIG:Debug>:d>")
|
|
|
|
- endif()
|
2019-03-08 22:09:33 -08:00
|
|
|
-endif()
|
2020-10-17 18:01:36 +09:00
|
|
|
+# if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
|
|
|
|
+# if(WITH_STATIC_CRT)
|
|
|
|
+# target_compile_options(antlr4_shared PRIVATE "/MT$<$<CONFIG:Debug>:d>")
|
|
|
|
+# target_compile_options(antlr4_static PRIVATE "/MT$<$<CONFIG:Debug>:d>")
|
|
|
|
+# else()
|
|
|
|
+# target_compile_options(antlr4_shared PRIVATE "/MD$<$<CONFIG:Debug>:d>")
|
|
|
|
+# target_compile_options(antlr4_static PRIVATE "/MD$<$<CONFIG:Debug>:d>")
|
|
|
|
+# endif()
|
2019-03-08 22:09:33 -08:00
|
|
|
+# endif()
|
2020-10-17 18:01:36 +09:00
|
|
|
|
2019-03-08 22:09:33 -08:00
|
|
|
set(static_lib_suffix "")
|
2020-10-17 18:01:36 +09:00
|
|
|
if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
|
2019-03-08 22:09:33 -08:00
|
|
|
|