From: Ole Streicher Date: Wed, 23 Dec 2015 15:43:15 +0100 Subject: Make shared library and python extension Multiarch aware. Also, fix the RPATH issues. --- src/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 565db8b..4967d32 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -221,12 +221,13 @@ add_subdirectory(plplot) include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR}/src ${CMAKE_SOURCE_DIR}/src/whereami/src ${CMAKE_BINARY_DIR}) link_directories(${LINK_DIRECTORIES}) +SET(CMAKE_SKIP_RPATH TRUE) add_library(gnudatalanguage SHARED ${SOURCES}) SET_TARGET_PROPERTIES(gnudatalanguage PROPERTIES SOVERSION 0) if(PYTHON_MODULE) #GDL.so - add_library(pythongdl SHARED pythongdl.cpp) + add_library(pythongdl SHARED datatypes.cpp) SET_TARGET_PROPERTIES(pythongdl PROPERTIES PREFIX "") - SET_TARGET_PROPERTIES(pythongdl PROPERTIES OUTPUT_NAME GDL) + SET_TARGET_PROPERTIES(pythongdl PROPERTIES OUTPUT_NAME GDL.${DEB_BUILD_MULTIARCH}) SET_TARGET_PROPERTIES(pythongdl PROPERTIES NO_SONAME TRUE) target_link_libraries(pythongdl gnudatalanguage) endif(PYTHON_MODULE) @@ -277,8 +278,7 @@ if(PYTHON_MODULE) install(TARGETS pythongdl DESTINATION ${PYTHON_SITE_DIR}) endif(PYTHON_MODULE) install(TARGETS gdl DESTINATION bin) -set_target_properties(gdl PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) -install(TARGETS gnudatalanguage DESTINATION lib) +install(TARGETS gnudatalanguage DESTINATION lib/${DEB_BUILD_MULTIARCH}) install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/pro/ DESTINATION ${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR}/lib PATTERN CVS EXCLUDE