[JuPedSim] Changed to GEOS C API.

eclipse-sumo · Aug 9, 2023 · ca44dc5 · ca44dc5
1 parent 2b623dc
commit ca44dc5
Show file tree

Hide file tree

Showing 4 changed files with 156 additions and 162 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -512,7 +512,7 @@ if (CHECK_OPTIONAL_LIBS)
             message(STATUS "Could NOT find GEOS! JuPedSim requires GEOS.")
         endif (GEOS_FOUND)
     else (jupedsim_FOUND)
-        message(STATUS "Could NOT find JuPedSim! Skipping JuPedSim integration targets.")
+        message(STATUS "Could NOT find JuPedSim! Skipping JuPedSim integration.")
     endif (jupedsim_FOUND)
 
     # add optional libraries

diff --git a/build/cmake_modules/FindGEOS.cmake b/build/cmake_modules/FindGEOS.cmake
@@ -1,8 +1,8 @@
 FIND_PATH(GEOS_INCLUDE_DIR NAMES geos.h HINTS ${JUPEDSIM_DIR}/include)
 IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    FIND_LIBRARY(GEOS_LIBRARY NAMES geosd geos HINTS ${JUPEDSIM_DIR}/lib)
+    FIND_LIBRARY(GEOS_LIBRARY NAMES geos_cd HINTS ${JUPEDSIM_DIR}/lib)
 ELSE ()
-    FIND_LIBRARY(GEOS_LIBRARY NAMES geos HINTS ${JUPEDSIM_DIR}/lib)
+    FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c HINTS ${JUPEDSIM_DIR}/lib) 
 ENDIF (CMAKE_BUILD_TYPE STREQUAL "Debug")
 
 IF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)