Skip to content

Commit

Permalink
Go back to ordinary install on Apple MacOS
Browse files Browse the repository at this point in the history
  • Loading branch information
pramsey committed Nov 15, 2023
1 parent e45ab35 commit 758238d
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -301,10 +301,11 @@ target_link_libraries(geos PUBLIC geos_cxx_flags PRIVATE $<BUILD_INTERFACE:ryu>)
# ryu is an object library, nothing is actually being linked here. The BUILD_INTERFACE
# switch was necessary to build on AppVeyor (CMake 3.16.2) but not locally (CMake 3.16.3)

if(APPLE AND BUILD_SHARED_LIBS)
set_target_properties(geos PROPERTIES
INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
endif()
# Leave install with an RPATH approach to linking
#if(APPLE AND BUILD_SHARED_LIBS)
# set_target_properties(geos PROPERTIES
# INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
#endif()

add_subdirectory(include)
add_subdirectory(src)
Expand Down Expand Up @@ -332,10 +333,11 @@ add_library(geos_c "")
add_library(GEOS::geos_c ALIAS geos_c)
target_link_libraries(geos_c PRIVATE geos)

if(APPLE AND BUILD_SHARED_LIBS)
set_target_properties(geos_c PROPERTIES
INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
endif()
# Leave install with an RPATH approach to linking
#if(APPLE AND BUILD_SHARED_LIBS)
# set_target_properties(geos_c PROPERTIES
# INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
#endif()

if(BUILD_SHARED_LIBS)
target_compile_definitions(geos_c
Expand Down

0 comments on commit 758238d

Please sign in to comment.