|
Orion Poplawski |
f133519 |
diff -up gdl-0.9.7rc1-20161104/src/CMakeLists.txt.antlr gdl-0.9.7rc1-20161104/src/CMakeLists.txt
|
|
Orion Poplawski |
f133519 |
--- gdl-0.9.7rc1-20161104/src/CMakeLists.txt.antlr 2016-10-19 15:14:13.000000000 -0600
|
|
Orion Poplawski |
f133519 |
+++ gdl-0.9.7rc1-20161104/src/CMakeLists.txt 2016-11-04 16:03:32.618417108 -0600
|
|
Orion Poplawski |
f133519 |
@@ -266,9 +266,7 @@ widget.cpp
|
|
Orion Poplawski |
3ebd12f |
widget.hpp
|
|
Orion Poplawski |
75887e0 |
)
|
|
Orion Poplawski |
75887e0 |
|
|
Orion Poplawski |
75887e0 |
-add_subdirectory(antlr)
|
|
Orion Poplawski |
75887e0 |
-
|
|
Orion Poplawski |
5532eca |
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR})
|
|
Orion Poplawski |
5532eca |
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR})
|
|
Orion Poplawski |
75887e0 |
link_directories(${LINK_DIRECTORIES})
|
|
Orion Poplawski |
75887e0 |
|
|
Orion Poplawski |
f133519 |
if(PYTHON_MODULE) #GDL.so
|
|
Orion Poplawski |
f133519 |
@@ -282,7 +280,6 @@ else(PYTHON_MODULE) #GDL.so
|
|
Orion Poplawski |
5532eca |
add_executable(gdl ${SOURCES})
|
|
Orion Poplawski |
5532eca |
endif(PYTHON_MODULE)
|
|
Orion Poplawski |
5532eca |
|
|
Orion Poplawski |
5532eca |
-add_dependencies(gdl antlr) # be sure that antlr is built before gdl
|
|
Orion Poplawski |
5532eca |
target_link_libraries(gdl antlr) # link antlr against gdl
|
|
Orion Poplawski |
3ebd12f |
if (MINGW)
|
|
Orion Poplawski |
3ebd12f |
target_link_libraries(gdl ws2_32)
|