wehub-resource-sync
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
diff --git a/runtime/Cpp/CMakeLists.txt b/runtime/Cpp/CMakeLists.txt
|
|
index 390078151..213258ac8 100644
|
|
--- a/runtime/Cpp/CMakeLists.txt
|
|
+++ b/runtime/Cpp/CMakeLists.txt
|
|
@@ -28,21 +28,21 @@ project(LIBANTLR4)
|
|
if(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR
|
|
CMAKE_VERSION VERSION_GREATER "3.0.0")
|
|
CMAKE_POLICY(SET CMP0026 NEW)
|
|
- CMAKE_POLICY(SET CMP0054 OLD)
|
|
- CMAKE_POLICY(SET CMP0045 OLD)
|
|
- CMAKE_POLICY(SET CMP0042 OLD)
|
|
+ CMAKE_POLICY(SET CMP0054 NEW)
|
|
+ CMAKE_POLICY(SET CMP0045 NEW)
|
|
+ CMAKE_POLICY(SET CMP0042 NEW)
|
|
endif()
|
|
|
|
if(CMAKE_VERSION VERSION_EQUAL "3.3.0" OR
|
|
CMAKE_VERSION VERSION_GREATER "3.3.0")
|
|
- CMAKE_POLICY(SET CMP0059 OLD)
|
|
- CMAKE_POLICY(SET CMP0054 OLD)
|
|
+ CMAKE_POLICY(SET CMP0059 NEW)
|
|
+ CMAKE_POLICY(SET CMP0054 NEW)
|
|
endif()
|
|
|
|
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|
- find_package(PkgConfig REQUIRED)
|
|
- pkg_check_modules(UUID REQUIRED uuid)
|
|
-endif()
|
|
+#if(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|
+# find_package(PkgConfig REQUIRED)
|
|
+# pkg_check_modules(UUID REQUIRED uuid)
|
|
+#endif()
|
|
if(APPLE)
|
|
find_library(COREFOUNDATION_LIBRARY CoreFoundation)
|
|
endif()
|
|
diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt
|
|
index 2c5e7376f..ae992f9cc 100644
|
|
--- a/runtime/Cpp/runtime/CMakeLists.txt
|
|
+++ b/runtime/Cpp/runtime/CMakeLists.txt
|
|
@@ -25,7 +25,7 @@ file(GLOB libantlrcpp_SRC
|
|
add_library(antlr4_shared SHARED ${libantlrcpp_SRC})
|
|
add_library(antlr4_static STATIC ${libantlrcpp_SRC})
|
|
|
|
-set(LIB_OUTPUT_DIR "${CMAKE_HOME_DIRECTORY}/dist") # put generated libraries here.
|
|
+set(LIB_OUTPUT_DIR "${EXTERNAL_LIB_DIR}")
|
|
message(STATUS "Output libraries to ${LIB_OUTPUT_DIR}")
|
|
|
|
# make sure 'make' works fine even if ${LIB_OUTPUT_DIR} is deleted.
|