2023-01-16 04:31:32 +00:00
|
|
|
diff -up gdl-1.0.2/src/CMakeLists.txt.antlr gdl-1.0.2/src/CMakeLists.txt
|
|
|
|
--- gdl-1.0.2/src/CMakeLists.txt.antlr 2023-01-06 10:39:47.000000000 -0700
|
|
|
|
+++ gdl-1.0.2/src/CMakeLists.txt 2023-01-16 08:51:18.033486027 -0700
|
|
|
|
@@ -197,9 +197,7 @@ endif(HAVE_LIBWXWIDGETS AND WIN32)
|
|
|
|
#local plplot drivers
|
|
|
|
add_subdirectory(plplotdriver)
|
2011-03-18 22:15:03 +00:00
|
|
|
|
|
|
|
-add_subdirectory(antlr)
|
|
|
|
-
|
2023-01-16 04:31:32 +00:00
|
|
|
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_SOURCE_DIR}/src/plplotdriver ${CMAKE_BINARY_DIR})
|
|
|
|
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/plplotdriver ${CMAKE_BINARY_DIR})
|
2011-03-18 22:15:03 +00:00
|
|
|
link_directories(${LINK_DIRECTORIES})
|
|
|
|
|
2017-01-06 18:07:52 +00:00
|
|
|
if(PYTHON_MODULE) #GDL.so
|
2023-01-16 04:31:32 +00:00
|
|
|
@@ -217,7 +215,6 @@ if(USE_OPENMP)
|
2021-08-24 01:43:16 +00:00
|
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
|
|
|
|
endif(USE_OPENMP)
|
2011-04-15 16:57:21 +00:00
|
|
|
|
|
|
|
-add_dependencies(gdl antlr) # be sure that antlr is built before gdl
|
|
|
|
target_link_libraries(gdl antlr) # link antlr against gdl
|
2014-10-09 22:45:38 +00:00
|
|
|
if (MINGW)
|
|
|
|
target_link_libraries(gdl ws2_32)
|