From: Ole Streicher Date: Wed, 27 Dec 2023 17:09:37 +0100 Subject: Use external whereami library instead of local copy --- src/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 809e093..cf2cced 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -213,11 +213,9 @@ ${WX_RC} ) endif(HAVE_LIBWXWIDGETS AND WIN32) -#whereami -add_library(whereami STATIC ${CMAKE_SOURCE_DIR}/src/whereami/src/whereami.c) add_subdirectory(plplot) -include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/whereami/src ${CMAKE_BINARY_DIR}) +include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR}) link_directories(${LINK_DIRECTORIES}) SET(CMAKE_SKIP_RPATH TRUE) @@ -243,7 +241,7 @@ if(USE_OPENMP) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") endif(USE_OPENMP) -add_dependencies(gnudatalanguage plplot whereami) +add_dependencies(gnudatalanguage plplot) target_link_libraries(gnudatalanguage plplot antlr-pic whereami) # link antlr against gdl. added librt for mmap (unix only, not osx, apparently) if (MINGW) target_link_libraries(gnudatalanguage ws2_32)