Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions Build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Copy link

Copilot AI May 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update the script’s help text or README to document the new --machine_install flag so users know how to invoke system-default installs.

Copilot uses AI. Check for mistakes.

options, args = parser.parse_args()
if options.env_vars != "False":
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down
16 changes: 8 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Copy link

Copilot AI May 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing several feature flags from ON to OFF by default is a breaking change; document these new defaults in the project README or release notes to inform users of the updated behavior.

Suggested change
# Default options for the CMake GUI
# Default options for the CMake GUI
# NOTE: If you change the default values of these feature flags, ensure that the changes are documented
# in the project's README or release notes to inform users of the updated behavior.

Copilot uses AI. Check for mistakes.
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)
Expand Down
6 changes: 3 additions & 3 deletions debug/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
Expand Down
6 changes: 3 additions & 3 deletions helper/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions kernels/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 3 additions & 3 deletions kernels/c_model/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions kernels/debug/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions kernels/extras/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions kernels/tiling/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions kernels/venum/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions libraries/debug/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions libraries/extras/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions sample/cnn/cnn_convert/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions sample/cnn/cnn_network/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions sample/cnn/cnn_test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions sample/framework/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions sample/targets/c_model/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions sample/targets/opencl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
6 changes: 3 additions & 3 deletions sample/targets/tiling/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions sample/targets/venum/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
30 changes: 15 additions & 15 deletions sample/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,37 +29,37 @@ 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} )

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))
Expand All @@ -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} )

Expand Down
6 changes: 3 additions & 3 deletions sample/vxu/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions tools/pgm2hdr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
6 changes: 3 additions & 3 deletions tools/query/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
Loading