diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bad install paths

Browse Source
This commit is contained in:
Vitor Santos Costa 2017-10-17 08:32:51 +01:00
parent d93134dcf6
commit 8437007716
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -525,9 +525,9 @@ SET(CMAKE_SKIP_BUILD_RPATH FALSE)
# when building, don't use the install RPATH already # when building, don't use the install RPATH already
# (but later on when installing) # (but later on when installing)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
SET(CMAKE_INSTALL_RPATH "${libdir}:${dlls}:") SET(CMAKE_INSTALL_RPATH "${libdir}")
# add the automatically determined parts of the RPATH # add the automatically determined parts of the RPATH
# which point to directories outside the build tree to the install RPATH # which point to directories outside the build tree to the install RPATH
@ -535,7 +535,7 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
# the RPATH to be used when installing, but only if it's not a system directory # the RPATH to be used when installing, but only if it's not a system directory
LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${libdir}" isSystemDir)
IF("${isSystemDir}" STREQUAL "-1") IF("${isSystemDir}" STREQUAL "-1")
SET(CMAKE_INSTALL_RPATH "${libdir}") SET(CMAKE_INSTALL_RPATH "${libdir}")
ENDIF("${isSystemDir}" STREQUAL "-1") ENDIF("${isSystemDir}" STREQUAL "-1")

2
library/regex/CMakeLists.txt
View File

@ -26,6 +26,6 @@ TARGET_INCLUDE_DIRECTORIES (regexp PUBLIC BEFORE
${CMAKE_TOP_SOURCE_DIR}/include;${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR} ) ${CMAKE_TOP_SOURCE_DIR}/include;${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR} )
install(TARGETS regexp install(TARGETS regexp
LIBRARY DESTINATION ${libdir} LIBRARY DESTINATION ${dlls}
RUNTIME DESTINATION ${dlls} RUNTIME DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls} ) ARCHIVE DESTINATION ${dlls} )

4
packages/cplint/CMakeLists.txt
View File

@ -147,7 +147,7 @@ IF (CUDD_FOUND)
) )
install(TARGETS bddem install(TARGETS bddem
LIBRARY DESTINATION ${libdir} LIBRARY DESTINATION ${dlls}
RUNTIME DESTINATION ${dlls} RUNTIME DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls} ARCHIVE DESTINATION ${dlls}
) )
@ -170,7 +170,7 @@ IF (CUDD_FOUND)
add_subDIRECTORY ( approx/simplecuddLPADs ) add_subDIRECTORY ( approx/simplecuddLPADs )
install(TARGETS cplint install(TARGETS cplint
LIBRARY DESTINATION ${libdir} LIBRARY DESTINATION ${dlls}
RUNTIME DESTINATION ${dlls} RUNTIME DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls} ARCHIVE DESTINATION ${dlls}
) )

4
packages/jpl/src/c/CMakeLists.txt
View File

@ -11,9 +11,7 @@ include_directories (${JAVA_INCLUDE_DIRS} ${JNI_INCLUDE_DIRS} )
# set(YAP_SYSTEM_OPTIONS "jpl " ${YAP_SYSTEM_OPTIONS} PARENT_SCOPE) # set(YAP_SYSTEM_OPTIONS "jpl " ${YAP_SYSTEM_OPTIONS} PARENT_SCOPE)
install(TARGETS jplYap install(TARGETS jplYap
LIBRARY DESTINATION ${libdir} LIBRARY DESTINATION ${dlls}
RUNTIME DESTINATION ${dlls} RUNTIME DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls} ARCHIVE DESTINATION ${dlls}
) )