Skip to content

Commit 62f299d

Browse files
GillesDuvertGiloo
andauthored
making gdl executable to export its symbols (again) (#2054)
Co-authored-by: Giloo <gildas@localhost>
1 parent 3fc8342 commit 62f299d

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

src/CMakeLists.txt

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,6 @@ if(PYTHON_MODULE) #GDL.so
231231
SET_TARGET_PROPERTIES(gdl PROPERTIES NO_SONAME TRUE)
232232
SET_TARGET_PROPERTIES(gdl PROPERTIES SUFFIX ".so") # e.g. Mac defaults to .dylib which is not looked for by Python
233233
else(PYTHON_MODULE) #GDL.so
234-
#permit gdl (exe) to export its symbols, necessary for linkimage and DLM
235-
set (CMAKE_SHARED_LIBRARY_ENABLE_EXPORTS true)
236234
set(SOURCES ${SOURCES} gdl.cpp)
237235
add_executable(gdl ${SOURCES})
238236
endif(PYTHON_MODULE)
@@ -279,17 +277,17 @@ else(PYTHON_MODULE)
279277
set_target_properties(gdl PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
280278
endif(PYTHON_MODULE)
281279

282-
### replaced by use of CMAKE_SHARED_LIBRARY_ENABLE_EXPORTS above
283-
### if (NOT APPLE AND NOT OSX AND NOT MINGW)
284-
### set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-dynamic")
285-
### endif()
286-
### if (APPLE OR OSX )
287-
### set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fvisibility=protected") #-exported_symbols_list ${EXPORTED_SYMBOLS_LIST}")
288-
### endif()
289-
### if (MINGW )
290-
### #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-all-symbols")
291-
### endif()
292-
###
280+
281+
if (NOT APPLE AND NOT OSX AND NOT MINGW)
282+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-dynamic")
283+
endif()
284+
if (APPLE OR OSX )
285+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fvisibility=protected") #-exported_symbols_list ${EXPORTED_SYMBOLS_LIST}")
286+
endif()
287+
if (MINGW )
288+
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-all-symbols")
289+
endif()
290+
293291
install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/pro/ DESTINATION ${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR}/lib
294292
PATTERN CVS EXCLUDE
295293
PATTERN checks EXCLUDE

0 commit comments

Comments
 (0)