1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
From: Ole Streicher <olebole@debian.org>
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 b734bdb..87299a7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -214,11 +214,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)
@@ -244,7 +242,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)
|
