diff options
author | Guo Yejun <yejun.guo@intel.com> | 2014-06-24 06:22:07 +0800 |
---|---|---|
committer | Zhigang Gong <zhigang.gong@intel.com> | 2014-06-24 23:20:53 +0800 |
commit | e6b6c50e84193c54207d7fefde41eba9b27fb135 (patch) | |
tree | eaea6c780a036dbf6c85e1120153015bd5db952d | |
parent | 75ffb4a996ef315835791a6b3f4f7f114eff6370 (diff) | |
download | beignet-e6b6c50e84193c54207d7fefde41eba9b27fb135.tar.gz |
add BEIGNET_INSTALL_DIR to clean code
Signed-off-by: Guo Yejun <yejun.guo@intel.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
-rw-r--r-- | CMakeLists.txt | 3 | ||||
-rw-r--r-- | backend/src/CMakeLists.txt | 29 | ||||
-rw-r--r-- | src/CMakeLists.txt | 2 |
3 files changed, 17 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c2d2a65..684e8089 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/") if (NOT LIB_INSTALL_DIR) set (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib") endif (NOT LIB_INSTALL_DIR) +if (NOT BEIGNET_INSTALL_DIR) + set (BEIGNET_INSTALL_DIR "${LIB_INSTALL_DIR}/beignet/") +endif (NOT BEIGNET_INSTALL_DIR) SET(EMULATE_IVB false CACHE BOOL "To emulate IVB") SET(EMULATE_SNB false CACHE BOOL "To emulate SNB") SET(EMULATE_HSW false CACHE BOOL "To emulate HSW") diff --git a/backend/src/CMakeLists.txt b/backend/src/CMakeLists.txt index 9b59d3c2..4fa84873 100644 --- a/backend/src/CMakeLists.txt +++ b/backend/src/CMakeLists.txt @@ -1,13 +1,10 @@ -set (beignet_install_path ${LIB_INSTALL_DIR}/beignet/) - - set (ocl_vector_spec_file ${GBE_SOURCE_DIR}/src/builtin_vector_proto.def) set (ocl_vector_file ${GBE_SOURCE_DIR}/src/ocl_vector.h) set (ocl_as_file ${GBE_SOURCE_DIR}/src/ocl_as.h) set (ocl_convert_file ${GBE_SOURCE_DIR}/src/ocl_convert.h) set (ocl_stdlib_tmpl_file ${GBE_SOURCE_DIR}/src/ocl_stdlib.tmpl.h) set (ocl_common_header_file ${GBE_SOURCE_DIR}/src/ocl_common_defines.h) -set (ocl_blob_file ${CMAKE_CURRENT_BINARY_DIR}${beignet_install_path}ocl_stdlib.h) +set (ocl_blob_file ${CMAKE_CURRENT_BINARY_DIR}${BEIGNET_INSTALL_DIR}ocl_stdlib.h) set (ocl_blob_cpp_file ${GBE_SOURCE_DIR}/src/ocl_stdlib_str.cpp) set (ocl_gen_blob_cmd ${GBE_SOURCE_DIR}/src/update_blob_ocl_header.py) set (ocl_gen_vector_cmd ${GBE_SOURCE_DIR}/src/gen_builtin_vector.py) @@ -36,7 +33,7 @@ add_custom_command( add_custom_command( OUTPUT ${ocl_blob_file} - COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/${beignet_install_path} + COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/${BEIGNET_INSTALL_DIR} COMMAND ${PYTHON_EXECUTABLE} ${ocl_gen_blob_cmd} ${ocl_stdlib_tmpl_file} ${ocl_blob_file} DEPENDS ${ocl_gen_blob_cmd} ${ocl_stdlib_tmpl_file} ${ocl_common_header_file} ${ocl_vector_file} ${ocl_as_file} ${ocl_convert_file} ) @@ -214,23 +211,23 @@ link_directories (${LLVM_LIBRARY_DIR} ${DRM_LIBDIR}) ADD_EXECUTABLE(gbe_bin_generater gbe_bin_generater.cpp) TARGET_LINK_LIBRARIES(gbe_bin_generater gbe) -install (TARGETS gbe LIBRARY DESTINATION ${LIB_INSTALL_DIR}/beignet) -install (TARGETS gbeinterp LIBRARY DESTINATION ${LIB_INSTALL_DIR}/beignet) +install (TARGETS gbe LIBRARY DESTINATION ${BEIGNET_INSTALL_DIR}) +install (TARGETS gbeinterp LIBRARY DESTINATION ${BEIGNET_INSTALL_DIR}) #install (FILES backend/program.h DESTINATION include/gen) -install (FILES ${ocl_blob_file} DESTINATION ${LIB_INSTALL_DIR}/beignet) -install (FILES ${pch_object} DESTINATION ${LIB_INSTALL_DIR}/beignet) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${pcm_lib} DESTINATION ${LIB_INSTALL_DIR}/beignet) +install (FILES ${ocl_blob_file} DESTINATION ${BEIGNET_INSTALL_DIR}) +install (FILES ${pch_object} DESTINATION ${BEIGNET_INSTALL_DIR}) +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${pcm_lib} DESTINATION ${BEIGNET_INSTALL_DIR}) # When build beignet itself, we need to export the local precompiled header file and precompiled module # file to libcl and utests. -set (LOCAL_PCH_OBJECT_DIR "${local_pch_object}:${beignet_install_path}/ocl_stdlib.h.pch" PARENT_SCOPE) -set (LOCAL_PCM_OBJECT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${pcm_lib}:${beignet_install_path}/${pcm_lib}" PARENT_SCOPE) +set (LOCAL_PCH_OBJECT_DIR "${local_pch_object}:${BEIGNET_INSTALL_DIR}/ocl_stdlib.h.pch" PARENT_SCOPE) +set (LOCAL_PCM_OBJECT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${pcm_lib}:${BEIGNET_INSTALL_DIR}/${pcm_lib}" PARENT_SCOPE) set (LOCAL_GBE_OBJECT_DIR "${CMAKE_CURRENT_BINARY_DIR}/libgbe.so" PARENT_SCOPE) set (LOCAL_INTERP_OBJECT_DIR "${CMAKE_CURRENT_BINARY_DIR}/libgbeinterp.so" PARENT_SCOPE) -set (PCH_OBJECT_DIR "${beignet_install_path}/ocl_stdlib.h.pch") -set (PCM_OBJECT_DIR "${beignet_install_path}/${pcm_lib}") -set (GBE_OBJECT_DIR "${beignet_install_path}/libgbe.so") -set (INTERP_OBJECT_DIR "${beignet_install_path}/libgbeinterp.so") +set (PCH_OBJECT_DIR "${BEIGNET_INSTALL_DIR}/ocl_stdlib.h.pch") +set (PCM_OBJECT_DIR "${BEIGNET_INSTALL_DIR}/${pcm_lib}") +set (GBE_OBJECT_DIR "${BEIGNET_INSTALL_DIR}/libgbe.so") +set (INTERP_OBJECT_DIR "${BEIGNET_INSTALL_DIR}/libgbeinterp.so") configure_file ( "GBEConfig.h.in" "GBEConfig.h" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5c89e55b..7ae84fe0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -115,4 +115,4 @@ target_link_libraries( ${CMAKE_DL_LIBS} ${OPENGL_LIBRARIES} ${OPTIONAL_EGL_LIBRARY}) -install (TARGETS cl LIBRARY DESTINATION ${LIB_INSTALL_DIR}/beignet) +install (TARGETS cl LIBRARY DESTINATION ${BEIGNET_INSTALL_DIR}) |