LMU/DKS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove rpath in cmake when AMD OpenCL is used - fixes segfaults in OpenCL. Write compiler flags and cmake options in DKSConfig.cmake.in file to be used by projects using DKS

Browse Source
This commit is contained in:
Locans Uldis
2017-01-10 16:06:00 +01:00
parent 7abc9fdbd3
commit 69a9f7b9fb
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -123,6 +123,7 @@ IF ( (${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_C_COMPILER_ID} STREQUAL "
MESSAGE(STATUS "OpenCL version : ${OpenCL_VERSION_STRING}") MESSAGE(STATUS "OpenCL version : ${OpenCL_VERSION_STRING}")
MESSAGE(STATUS "OpenCL include dir: ${OpenCL_INCLUDE_DIR}") MESSAGE(STATUS "OpenCL include dir: ${OpenCL_INCLUDE_DIR}")
MESSAGE(STATUS "OpenCL library dir: ${OpenCL_LIBRARY}") MESSAGE(STATUS "OpenCL library dir: ${OpenCL_LIBRARY}")
SET(CMAKE_SKIP_RPATH TRUE)
INCLUDE_DIRECTORIES(${OpenCL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${OpenCL_INCLUDE_DIR})
LINK_DIRECTORIES(${OpenCL_LIBRARY}) LINK_DIRECTORIES(${OpenCL_LIBRARY})
ENDIF (OpenCL_FOUND) ENDIF (OpenCL_FOUND)

3
cmake/DKSConfig.cmake.in
View File

@ -1,4 +1,5 @@
SET(${PROJECT_NAME}_CMAKE_CXX_FLAGS "${${PROJECT_NAME}_CXX_FLAGS}") SET(${PROJECT_NAME}_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
SET(${PROJECT_NAME}_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include") SET(${PROJECT_NAME}_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include")
SET(${PROJECT_NAME}_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/lib") SET(${PROJECT_NAME}_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/lib")
SET(${PROJECT_NAME}_LIBRARY "dks") SET(${PROJECT_NAME}_LIBRARY "dks")
SET(CMAKE_SKIP_RPATH ${CMAKE_SKIP_RPATH})