f979b974a5
* GDL: python integration fixes * renamed python-related variants to follow the convention * building the Python module requires patches currently targetting 0.9.8 othwerwise asking for the Python module *only* builds the Pyhton module * building the python module also requires patching the vendored (with the GDL) antlr to be built as a shared library * Typo Co-Authored-By: rmsds <ricardo.d.silva@gmail.com> * Rename embed-python variant to embed_python
28 lines
942 B
Diff
28 lines
942 B
Diff
From: Ricardo Silva <ricardo.silva@epfl.ch>
|
|
Date: Wed, 3 Oct 2018 13:42:25 +0200
|
|
Subject: [PATCH] Always build antlr as shared library
|
|
|
|
---
|
|
src/antlr/CMakeLists.txt | 8 ++------
|
|
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/antlr/CMakeLists.txt b/src/antlr/CMakeLists.txt
|
|
index 26a38e3..083e50d 100644
|
|
--- a/src/antlr/CMakeLists.txt
|
|
+++ b/src/antlr/CMakeLists.txt
|
|
@@ -2,9 +2,5 @@ aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} ANTLRSOURCES)
|
|
list(REMOVE_ITEM ANTLRSOURCES ${CMAKE_CURRENT_SOURCE_DIR}/dll.cpp)
|
|
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/antlr)
|
|
|
|
-if(PYTHON_MODULE)
|
|
- add_library(antlr SHARED ${ANTLRSOURCES})
|
|
- install(TARGETS antlr DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
|
|
-else(PYTHON_MODULE)
|
|
- add_library(antlr STATIC ${ANTLRSOURCES})
|
|
-endif(PYTHON_MODULE)
|
|
+add_library(antlr SHARED ${ANTLRSOURCES})
|
|
+install(TARGETS antlr DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
|
|
--
|
|
1.8.3.1
|
|
|