From f311d98cba3d0b1ea8c4523268f71fe016d41949 Mon Sep 17 00:00:00 2001 From: Karthik Poduval Date: Sat, 17 Feb 2024 12:33:29 -0800 Subject: [PATCH] Add machine_install option There is not way to install to a machine as build artifacts stayed in build folder, add such an option while also updating CMakeLists.txt to install to correct paths. --- Build.py | 18 +++++++++------- CMakeLists.txt | 16 +++++++------- debug/CMakeLists.txt | 6 +++--- examples/CMakeLists.txt | 6 +++--- helper/CMakeLists.txt | 6 +++--- kernels/CMakeLists.txt | 6 +++--- kernels/c_model/CMakeLists.txt | 6 +++--- kernels/debug/CMakeLists.txt | 6 +++--- kernels/extras/CMakeLists.txt | 6 +++--- kernels/tiling/CMakeLists.txt | 6 +++--- kernels/venum/CMakeLists.txt | 6 +++--- libraries/debug/CMakeLists.txt | 6 +++--- libraries/extras/CMakeLists.txt | 6 +++--- sample/cnn/cnn_convert/CMakeLists.txt | 6 +++--- sample/cnn/cnn_network/CMakeLists.txt | 6 +++--- sample/cnn/cnn_test/CMakeLists.txt | 6 +++--- sample/framework/CMakeLists.txt | 6 +++--- sample/targets/c_model/CMakeLists.txt | 6 +++--- sample/targets/opencl/CMakeLists.txt | 6 +++--- sample/targets/tiling/CMakeLists.txt | 6 +++--- sample/targets/venum/CMakeLists.txt | 6 +++--- sample/tests/CMakeLists.txt | 30 +++++++++++++-------------- sample/vxu/CMakeLists.txt | 6 +++--- tools/pgm2hdr/CMakeLists.txt | 6 +++--- tools/query/CMakeLists.txt | 6 +++--- utils/CMakeLists.txt | 6 +++--- utils/half/CMakeLists.txt | 6 +++--- 27 files changed, 106 insertions(+), 102 deletions(-) diff --git a/Build.py b/Build.py index 1fbb9d9..c4ec4f6 100644 --- a/Build.py +++ b/Build.py @@ -96,6 +96,8 @@ def main(): # C Flags parser.add_option("--c_flags", dest="c_flags", help="Set C Compiler Flags -DCMAKE_C_FLAGS=" " [Default empty]", default='') parser.add_option("--cpp_flags", dest="cpp_flags", help="Set CPP Compiler Flags -DCMAKE_CXX_FLAGS=" " [Default empty]", default='') + # machine install to /usr/local/.... paths + parser.add_option("--machine_install", dest="machine_install", help="Install to machine to preferred destination path", default=False, action='store_true') options, args = parser.parse_args() if options.env_vars != "False": @@ -163,12 +165,13 @@ def main(): os.makedirs(tail) os.chdir(tail) - install_dir = os.path.join(outputDir, "install", os_enum.toString(operatingSys), arch_enum.toString(arch)) - if operatingSys == os_enum.Win: - # Add \\${BUILD_TYPE} in order to support "Debug" \ "Release" build in visual studio - install_dir += '\\${BUILD_TYPE}' - else: - install_dir = os.path.join(install_dir, configuration_enum.toString(conf)) + if not options.machine_install: + install_dir = os.path.join(outputDir, "install", os_enum.toString(operatingSys), arch_enum.toString(arch)) + if operatingSys == os_enum.Win: + # Add \\${BUILD_TYPE} in order to support "Debug" \ "Release" build in visual studio + install_dir += '\\${BUILD_TYPE}' + else: + install_dir = os.path.join(install_dir, configuration_enum.toString(conf)) cmake_generator_command = '' # if the user set generator @@ -180,7 +183,8 @@ def main(): cmd = ['cmake'] cmd += [cmakeDir] cmd += ['-DCMAKE_BUILD_TYPE=' + configuration_enum.toString(conf)] - cmd += ['-DCMAKE_INSTALL_PREFIX=' + install_dir] + if not options.machine_install: + cmd += ['-DCMAKE_INSTALL_PREFIX=' + install_dir] if operatingSys == os_enum.Android: cmd += ['-DANDROID=1'] if arch == arch_enum.x64: diff --git a/CMakeLists.txt b/CMakeLists.txt index ce6809e..35868c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ # Global setup file for OpenVX CMake # -cmake_minimum_required(VERSION 2.8.9) +cmake_minimum_required(VERSION 3.0.0) file(READ "${CMAKE_SOURCE_DIR}/VERSION" OPENVX_VERSION) string(STRIP "${OPENVX_VERSION}" OPENVX_VERSION) @@ -52,19 +52,19 @@ set(CMAKE_CONFIGURATION_TYPES set(CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} CACHE STRING "Available build configurations." FORCE) # Default options for the CMake GUI -option( OPENVX_USE_IX ON ) -option( OPENVX_USE_NN ON ) -option( OPENVX_USE_USER_DATA_OBJECT ON ) +option( OPENVX_USE_IX OFF ) +option( OPENVX_USE_NN OFF ) +option( OPENVX_USE_USER_DATA_OBJECT OFF ) option( OPENVX_USE_PIPELINING OFF ) option( OPENVX_USE_STREAMING OFF ) option( OPENVX_USE_OPENCL_INTEROP OFF ) option( OPENVX_USE_S16 OFF ) option( OPENVX_USE_TILING OFF ) option( OPENVX_USE_XML OFF ) -option( OPENVX_CONFORMANCE_VISION ON ) -option( OPENVX_CONFORMANCE_NEURAL_NETWORKS ON ) -option( OPENVX_CONFORMANCE_NNEF_IMPORT ON) -option( OPENVX_USE_ENHANCED_VISION ON ) +option( OPENVX_CONFORMANCE_VISION OFF ) +option( OPENVX_CONFORMANCE_NEURAL_NETWORKS OFF ) +option( OPENVX_CONFORMANCE_NNEF_IMPORT OFF) +option( OPENVX_USE_ENHANCED_VISION OFF ) option( EXPERIMENTAL_USE_DOT OFF ) option( EXPERIMENTAL_PLATFORM_SUPPORTS_16_FLOAT OFF ) option( EXPERIMENTAL_USE_VENUM OFF) diff --git a/debug/CMakeLists.txt b/debug/CMakeLists.txt index ab5e25f..8a039d6 100644 --- a/debug/CMakeLists.txt +++ b/debug/CMakeLists.txt @@ -30,8 +30,8 @@ FIND_SOURCES() add_library (${TARGET_NAME} ${SOURCE_FILES}) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${DEBUG_FOLDER} ) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 9dc376e..457dfb2 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -78,9 +78,9 @@ if (OPENVX_USE_TILING) endif (OPENVX_USE_TILING) install ( TARGETS ${TARGET_NAME_XYZ_LIB} ${TARGET_NAME_XYZ} ${TARGET_NAME_EXAMPLE} ${TARGET_NAME_EXAMPLE_CODE} ${TARGET_NAME_EXAMPLE_TILING} ${TARGET_NAME_TILING_TEST} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME_XYZ_LIB} PROPERTIES FOLDER ${EXAMPLES_FOLDER} ) set_target_properties( ${TARGET_NAME_XYZ} PROPERTIES FOLDER ${EXAMPLES_FOLDER} ) diff --git a/helper/CMakeLists.txt b/helper/CMakeLists.txt index 717b391..7614965 100644 --- a/helper/CMakeLists.txt +++ b/helper/CMakeLists.txt @@ -30,8 +30,8 @@ FIND_SOURCES() add_library (${TARGET_NAME} ${SOURCE_FILES}) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${HELPER_FOLDER} ) diff --git a/kernels/CMakeLists.txt b/kernels/CMakeLists.txt index e6f2eeb..36fbf5b 100644 --- a/kernels/CMakeLists.txt +++ b/kernels/CMakeLists.txt @@ -44,9 +44,9 @@ file(GLOB OVX_SRC_NNEF_LIB "${CMAKE_SOURCE_DIR}/kernels/NNEF-Tools/parser/cpp/sr add_library (${TARGET_NAME} STATIC ${OVX_SRC_NNEF_LIB} ) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${HELPER_FOLDER} ) endif (OPENVX_CONFORMANCE_NNEF_IMPORT) diff --git a/kernels/c_model/CMakeLists.txt b/kernels/c_model/CMakeLists.txt index 0bf5901..82e1baa 100644 --- a/kernels/c_model/CMakeLists.txt +++ b/kernels/c_model/CMakeLists.txt @@ -32,8 +32,8 @@ add_library (${TARGET_NAME} ${SOURCE_FILES}) target_link_libraries( ${TARGET_NAME} openvx ) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${KERNELS_FOLDER} ) diff --git a/kernels/debug/CMakeLists.txt b/kernels/debug/CMakeLists.txt index b8d84d2..892890d 100644 --- a/kernels/debug/CMakeLists.txt +++ b/kernels/debug/CMakeLists.txt @@ -29,8 +29,8 @@ FIND_SOURCES() add_library (${TARGET_NAME} ${SOURCE_FILES}) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${KERNELS_FOLDER} ) diff --git a/kernels/extras/CMakeLists.txt b/kernels/extras/CMakeLists.txt index 39e2dc2..81f39f5 100644 --- a/kernels/extras/CMakeLists.txt +++ b/kernels/extras/CMakeLists.txt @@ -29,8 +29,8 @@ FIND_SOURCES() add_library (${TARGET_NAME} ${SOURCE_FILES}) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${KERNELS_FOLDER} ) diff --git a/kernels/tiling/CMakeLists.txt b/kernels/tiling/CMakeLists.txt index 223e153..cba2c91 100644 --- a/kernels/tiling/CMakeLists.txt +++ b/kernels/tiling/CMakeLists.txt @@ -33,8 +33,8 @@ add_library (${TARGET_NAME} ${SOURCE_FILES}) target_link_libraries( ${TARGET_NAME} openvx ) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${KERNELS_FOLDER} ) diff --git a/kernels/venum/CMakeLists.txt b/kernels/venum/CMakeLists.txt index ce23e8d..5408134 100644 --- a/kernels/venum/CMakeLists.txt +++ b/kernels/venum/CMakeLists.txt @@ -33,8 +33,8 @@ add_library (${TARGET_NAME} STATIC ${SOURCE_FILES}) target_link_libraries( ${TARGET_NAME} openvx ) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${KERNELS_FOLDER} ) diff --git a/libraries/debug/CMakeLists.txt b/libraries/debug/CMakeLists.txt index 3e9f835..1e992f5 100644 --- a/libraries/debug/CMakeLists.txt +++ b/libraries/debug/CMakeLists.txt @@ -46,9 +46,9 @@ endif (CYGWIN) target_link_libraries( ${TARGET_NAME_2} openvx-helper openvx-debug_k-lib openvx ) install ( TARGETS ${TARGET_NAME_1} ${TARGET_NAME_2} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME_1} PROPERTIES FOLDER ${LIBRARIES_DEBUG_FOLDER} ) set_target_properties( ${TARGET_NAME_2} PROPERTIES FOLDER ${LIBRARIES_DEBUG_FOLDER} ) diff --git a/libraries/extras/CMakeLists.txt b/libraries/extras/CMakeLists.txt index c36ef89..896f0a3 100644 --- a/libraries/extras/CMakeLists.txt +++ b/libraries/extras/CMakeLists.txt @@ -48,9 +48,9 @@ endif (CYGWIN) target_link_libraries( ${TARGET_NAME_2} openvx-helper openvx-extras_k-lib openvx ) install ( TARGETS ${TARGET_NAME_1} ${TARGET_NAME_2} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME_1} PROPERTIES FOLDER ${LIBRARIES_EXTRAS_FOLDER} ) set_target_properties( ${TARGET_NAME_2} PROPERTIES FOLDER ${LIBRARIES_EXTRAS_FOLDER} ) diff --git a/sample/cnn/cnn_convert/CMakeLists.txt b/sample/cnn/cnn_convert/CMakeLists.txt index 768e347..94ebd1d 100644 --- a/sample/cnn/cnn_convert/CMakeLists.txt +++ b/sample/cnn/cnn_convert/CMakeLists.txt @@ -21,6 +21,6 @@ set( TARGET_NAME cnn_convert ) add_executable (${TARGET_NAME} cnn_convert.cpp ) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) diff --git a/sample/cnn/cnn_network/CMakeLists.txt b/sample/cnn/cnn_network/CMakeLists.txt index a3db037..c4692a8 100644 --- a/sample/cnn/cnn_network/CMakeLists.txt +++ b/sample/cnn/cnn_network/CMakeLists.txt @@ -43,6 +43,6 @@ target_link_libraries( ${TARGET_NAME} openvx vxu half ) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) diff --git a/sample/cnn/cnn_test/CMakeLists.txt b/sample/cnn/cnn_test/CMakeLists.txt index 725e953..cc6e945 100644 --- a/sample/cnn/cnn_test/CMakeLists.txt +++ b/sample/cnn/cnn_test/CMakeLists.txt @@ -30,6 +30,6 @@ add_executable (${TARGET_NAME} test.cpp ) target_link_libraries( ${TARGET_NAME} openvx vxu cnn_network ) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) diff --git a/sample/framework/CMakeLists.txt b/sample/framework/CMakeLists.txt index 10f09d9..599acc7 100644 --- a/sample/framework/CMakeLists.txt +++ b/sample/framework/CMakeLists.txt @@ -85,8 +85,8 @@ target_link_libraries( ${TARGET_NAME} openvx-helper utils-lib vx_debug ${LINK_AD endif (OPENVX_CONFORMANCE_NNEF_IMPORT) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${SAMPLE_FOLDER} ) diff --git a/sample/targets/c_model/CMakeLists.txt b/sample/targets/c_model/CMakeLists.txt index 54fd0fa..f403846 100644 --- a/sample/targets/c_model/CMakeLists.txt +++ b/sample/targets/c_model/CMakeLists.txt @@ -47,8 +47,8 @@ endif (CYGWIN) target_link_libraries( ${TARGET_NAME} openvx-debug-lib openvx-extras-lib openvx-helper openvx-c_model-lib openvx vxu half) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${SAMPLE_TARGETS_FOLDER} ) diff --git a/sample/targets/opencl/CMakeLists.txt b/sample/targets/opencl/CMakeLists.txt index e844268..4132263 100644 --- a/sample/targets/opencl/CMakeLists.txt +++ b/sample/targets/opencl/CMakeLists.txt @@ -48,8 +48,8 @@ if ( EXPERIMENTAL_USE_OPENCL ) target_link_libraries( ${TARGET_NAME} openvx ) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) endif ( EXPERIMENTAL_USE_OPENCL ) diff --git a/sample/targets/tiling/CMakeLists.txt b/sample/targets/tiling/CMakeLists.txt index 5dd957a..d9518f4 100644 --- a/sample/targets/tiling/CMakeLists.txt +++ b/sample/targets/tiling/CMakeLists.txt @@ -43,8 +43,8 @@ endif (CYGWIN) target_link_libraries( ${TARGET_NAME} openvx-debug-lib openvx-extras-lib openvx-helper openvx-tiling_chaining-lib openvx vxu half) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${SAMPLE_TARGETS_FOLDER} ) diff --git a/sample/targets/venum/CMakeLists.txt b/sample/targets/venum/CMakeLists.txt index 6d12c12..02b6a9f 100644 --- a/sample/targets/venum/CMakeLists.txt +++ b/sample/targets/venum/CMakeLists.txt @@ -44,8 +44,8 @@ endif (CYGWIN) target_link_libraries( ${TARGET_NAME} openvx-debug-lib openvx-extras-lib openvx-helper openvx-venum-lib openvx vxu half ) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${SAMPLE_TARGETS_FOLDER} ) diff --git a/sample/tests/CMakeLists.txt b/sample/tests/CMakeLists.txt index eeb396e..717e10b 100644 --- a/sample/tests/CMakeLists.txt +++ b/sample/tests/CMakeLists.txt @@ -29,9 +29,9 @@ add_executable (${TARGET_NAME} vx_test.c) target_link_libraries( ${TARGET_NAME} vx_xyz_lib openvx-debug-lib openvx-extras-lib openvx-helper openvx vxu ) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${SAMPLE_FOLDER} ) @@ -39,27 +39,27 @@ set( TARGET_NAME2 vx_bug13510 ) add_executable ( ${TARGET_NAME2} vx_bug13510.c) target_link_libraries( ${TARGET_NAME2} openvx-debug-lib openvx-extras-lib openvx-helper openvx vxu ) install ( TARGETS ${TARGET_NAME2} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME2} PROPERTIES FOLDER ${SAMPLE_FOLDER} ) set( TARGET_NAME3 vx_bug13518 ) add_executable ( ${TARGET_NAME3} vx_bug13518.c) target_link_libraries( ${TARGET_NAME3} openvx-debug-lib openvx-extras-lib openvx-helper openvx vxu ) install ( TARGETS ${TARGET_NAME3} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME3} PROPERTIES FOLDER ${SAMPLE_FOLDER} ) set( TARGET_NAME4 vx_bug13517 ) add_executable ( ${TARGET_NAME4} vx_bug13517.c) target_link_libraries( ${TARGET_NAME4} openvx-debug-lib openvx-extras-lib openvx-helper openvx vxu ) install ( TARGETS ${TARGET_NAME4} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME4} PROPERTIES FOLDER ${SAMPLE_FOLDER} ) if ((UNIX) AND (OPENVX_USE_SDL)) @@ -72,9 +72,9 @@ if ((UNIX) AND (OPENVX_USE_SDL)) target_link_libraries( ${TARGET_NAME_CAM_TEST} openvx-debug-lib openvx-extras-lib openvx-helper openvx vxu ) install ( TARGETS ${TARGET_NAME_CAM_TEST} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME_CAM_TEST} PROPERTIES FOLDER ${SAMPLE_FOLDER} ) diff --git a/sample/vxu/CMakeLists.txt b/sample/vxu/CMakeLists.txt index ded03f9..f2172dc 100644 --- a/sample/vxu/CMakeLists.txt +++ b/sample/vxu/CMakeLists.txt @@ -53,8 +53,8 @@ if (OPENVX_USE_OPENCL_INTEROP) endif (OPENVX_USE_OPENCL_INTEROP) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${SAMPLE_FOLDER} ) diff --git a/tools/pgm2hdr/CMakeLists.txt b/tools/pgm2hdr/CMakeLists.txt index 5c92a9b..1ad43b6 100644 --- a/tools/pgm2hdr/CMakeLists.txt +++ b/tools/pgm2hdr/CMakeLists.txt @@ -29,8 +29,8 @@ FIND_SOURCES() add_executable (${TARGET_NAME} ${SOURCE_FILES}) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${TOOLS_FOLDER} ) diff --git a/tools/query/CMakeLists.txt b/tools/query/CMakeLists.txt index 277bcbe..4b0cb24 100644 --- a/tools/query/CMakeLists.txt +++ b/tools/query/CMakeLists.txt @@ -31,8 +31,8 @@ add_executable (${TARGET_NAME} ${SOURCE_FILES}) target_link_libraries( ${TARGET_NAME} openvx-helper openvx vxu ) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${TOOLS_FOLDER} ) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index cdcc067..cb980f9 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -29,8 +29,8 @@ FIND_SOURCES() add_library (${TARGET_NAME} ${SOURCE_FILES}) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) set_target_properties( ${TARGET_NAME} PROPERTIES FOLDER ${KERNELS_FOLDER} ) diff --git a/utils/half/CMakeLists.txt b/utils/half/CMakeLists.txt index db80c09..b2ad52d 100644 --- a/utils/half/CMakeLists.txt +++ b/utils/half/CMakeLists.txt @@ -17,7 +17,7 @@ add_library (${TARGET_NAME} ${SOURCE_FILES} ) install ( TARGETS ${TARGET_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION bin - LIBRARY DESTINATION bin ) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )