0000519: Patch to set proper RPATH's for system wide installation on Linux
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5270 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
@@ -50,6 +50,7 @@ elseif(MINGW)
|
||||
else(MSVC)
|
||||
set_target_properties(Inspection PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
|
||||
set_target_properties(Inspection PROPERTIES PREFIX "")
|
||||
set_target_properties(Inspection PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
|
||||
endif(MSVC)
|
||||
|
||||
install(TARGETS Inspection DESTINATION lib)
|
||||
|
||||
INSTALL(TARGETS Inspection DESTINATION lib)
|
||||
|
||||
@@ -4,7 +4,7 @@ if(FREECAD_BUILD_GUI)
|
||||
add_subdirectory(Gui)
|
||||
endif(FREECAD_BUILD_GUI)
|
||||
|
||||
install(
|
||||
INSTALL(
|
||||
FILES
|
||||
Init.py
|
||||
InitGui.py
|
||||
|
||||
@@ -47,26 +47,27 @@ SET(InspectionGui_SRCS
|
||||
ViewProviderInspection.cpp
|
||||
ViewProviderInspection.h
|
||||
Workbench.cpp
|
||||
Workbench.h
|
||||
)
|
||||
|
||||
add_library(InspectionGui SHARED ${InspectionGui_SRCS})
|
||||
target_link_libraries(InspectionGui ${InspectionGui_LIBS})
|
||||
fc_copy_script("Mod/Inspection" "InspectionGui" InitGui.py)
|
||||
|
||||
if(MSVC)
|
||||
set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
|
||||
set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
|
||||
set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
|
||||
set_target_properties(InspectionGui PROPERTIES PREFIX "../")
|
||||
elseif(MINGW)
|
||||
set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
|
||||
set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
|
||||
set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
|
||||
set_target_properties(InspectionGui PROPERTIES PREFIX "")
|
||||
else(MSVC)
|
||||
set_target_properties(InspectionGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
|
||||
set_target_properties(InspectionGui PROPERTIES PREFIX "")
|
||||
endif(MSVC)
|
||||
|
||||
install(TARGETS InspectionGui DESTINATION lib)
|
||||
Workbench.h
|
||||
)
|
||||
|
||||
add_library(InspectionGui SHARED ${InspectionGui_SRCS})
|
||||
target_link_libraries(InspectionGui ${InspectionGui_LIBS})
|
||||
fc_copy_script("Mod/Inspection" "InspectionGui" InitGui.py)
|
||||
|
||||
if(MSVC)
|
||||
set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
|
||||
set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
|
||||
set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
|
||||
set_target_properties(InspectionGui PROPERTIES PREFIX "../")
|
||||
elseif(MINGW)
|
||||
set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")
|
||||
set_target_properties(InspectionGui PROPERTIES DEBUG_OUTPUT_NAME "InspectionGui_d")
|
||||
set_target_properties(InspectionGui PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
|
||||
set_target_properties(InspectionGui PROPERTIES PREFIX "")
|
||||
else(MSVC)
|
||||
set_target_properties(InspectionGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/Inspection)
|
||||
set_target_properties(InspectionGui PROPERTIES PREFIX "")
|
||||
set_target_properties(InspectionGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
|
||||
endif(MSVC)
|
||||
|
||||
INSTALL(TARGETS InspectionGui DESTINATION lib)
|
||||
|
||||
Reference in New Issue
Block a user