diff --git a/CMake/External/External_FTD2XX.cmake b/CMake/External/External_FTD2XX.cmake deleted file mode 100644 index b67c0ea2db5faed79ea7bedff1a95b8716e0b7d8..0000000000000000000000000000000000000000 --- a/CMake/External/External_FTD2XX.cmake +++ /dev/null @@ -1,89 +0,0 @@ -if(NOT WIN32) - message(WARNING "System not supported. Only Windows is supported for External_FTD2XX.cmake.") - message(WARNING "FTD2XX should not be needed on your system.") - return() -endif() - -include(imstkAddExternalProject) - -# Set FTD2XX_SOURCE_DIR and FTD2XX_PREFIX -imstk_define_external_dirs( FTD2XX ) - -# Directories and filenames specific to the FTD2XX archive layout -set(_dll_dir "i386") -set(_dll_name "ftd2xx.dll") -set(_lib_dir "i386") -set(_lib_name "ftd2xx.lib") -if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") - set(_dll_dir "amd64") - set(_dll_name "ftd2xx64.dll") - set(_lib_dir "amd64") - set(_lib_name "ftd2xx.lib") -endif() - -# Directories and filenames specific to the FTD2XX install layout -set(FTD2XX_DLL_DIR "bin") -set(FTD2XX_DLL_NAME "${_dll_name}") -set(FTD2XX_LIB_DIR "lib") -set(FTD2XX_LIB_NAME "${_lib_name}") - -#----------------------------------------------------------------------------- -# Set install commands -#----------------------------------------------------------------------------- -if(CMAKE_PROJECT_NAME STREQUAL "iMSTK") - set(FTD2XX_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}) -endif() - -set(copy_ftd2xx_headers_command - ${CMAKE_COMMAND} -E copy - ${FTD2XX_SOURCE_DIR}/ftd2xx.h - ${FTD2XX_INSTALL_DIR}/include/ftd2xx/ftd2xx.h - ) -set(copy_ftd2xx_lib_command - ${CMAKE_COMMAND} -E copy - ${FTD2XX_SOURCE_DIR}/${_lib_dir}/${_lib_name} - ${FTD2XX_INSTALL_DIR}/${FTD2XX_LIB_DIR}/${_lib_name} - ) -set(copy_ftd2xx_dll_command - ${CMAKE_COMMAND} -E copy - ${FTD2XX_SOURCE_DIR}/${_dll_dir}/${_dll_name} - ${FTD2XX_INSTALL_DIR}/${FTD2XX_DLL_DIR}/${_dll_name} - ) - -set(FTD2XX_INSTALL_COMMAND - INSTALL_COMMAND - COMMAND ${copy_ftd2xx_headers_command} - COMMAND ${copy_ftd2xx_lib_command} - COMMAND ${copy_ftd2xx_dll_command} - ) - -if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") - # HS 2021-aug-08 Some dependencies expect the dll name to - # be ftd2xx.dll rather than ftd2xx64.dll we're copying here - # to the renamed version as the whole chain is built via 64 bit builds - set(copy_ftd2xx_dll_command_rename - ${CMAKE_COMMAND} -E copy - ${FTD2XX_SOURCE_DIR}/${_lib_dir}/ftd2xx64.dll - ${FTD2XX_INSTALL_DIR}/bin/ftd2xx.dll - ) - - list(APPEND FTD2XX_INSTALL_COMMAND - COMMAND ${copy_ftd2xx_dll_command_rename} - ) -endif() - -#----------------------------------------------------------------------------- -# Add External Project -#----------------------------------------------------------------------------- -imstk_add_external_project( FTD2XX - URL http://www.ftdichip.com/Drivers/CDM/CDM%20v2.12.18%20WHQL%20Certified.zip - URL_MD5 e1a194765d7bcc58968d523484b74140 - DOWNLOAD_DIR ${FTD2XX_PREFIX} - SOURCE_DIR ${FTD2XX_SOURCE_DIR} - UPDATE_COMMAND ${SKIP_STEP_COMMAND} - CONFIGURE_COMMAND ${SKIP_STEP_COMMAND} - BUILD_COMMAND ${SKIP_STEP_COMMAND} - ${FTD2XX_INSTALL_COMMAND} - RELATIVE_INCLUDE_PATH "/" - #VERBOSE -) diff --git a/CMake/External/External_LibNiFalcon.cmake b/CMake/External/External_LibNiFalcon.cmake deleted file mode 100644 index 1d9ab0a6eaebba78a0d0c2d9ff73898b624a11fc..0000000000000000000000000000000000000000 --- a/CMake/External/External_LibNiFalcon.cmake +++ /dev/null @@ -1,36 +0,0 @@ -#----------------------------------------------------------------------------- -# Add External Project -#----------------------------------------------------------------------------- -set(LIBNIFALCON_DEPENDENCIES "") -if(WIN32) - list(APPEND LIBNIFALCON_DEPENDENCIES "FTD2XX") -endif(WIN32) - -# Download options -if(NOT DEFINED iMSTK_LibNiFalcon_GIT_SHA) - set(iMSTK_LibNiFalcon_GIT_SHA "libusb1-windows") -endif() -if(NOT DEFINED iMSTK_LibNiFalcon_GIT_REPOSITORY) - set(EXTERNAL_PROJECT_DOWNLOAD_OPTIONS - URL https://gitlab.kitware.com/iMSTK/libnifalcon/-/archive/${iMSTK_LibNiFalcon_GIT_SHA}/libnifalcon-${iMSTK_LibNiFalcon_GIT_SHA}.zip - URL_HASH MD5=6d5d68c92837388bfcd27f99a48b921d - ) -else() - set(EXTERNAL_PROJECT_DOWNLOAD_OPTIONS - GIT_REPOSITORY ${iMSTK_LibNiFalcon_GIT_REPOSITORY} - GIT_TAG ${iMSTK_LibNiFalcon_GIT_SHA} - ) -endif() - -include(imstkAddExternalProject) -imstk_add_external_project( LibNiFalcon - ${EXTERNAL_PROJECT_DOWNLOAD_OPTIONS} - CMAKE_CACHE_ARGS - -DBUILD_TESTING:BOOL=OFF - -DBUILD_EXAMPLES:BOOL=OFF - -DBUILD_SWIG_BINDINGS:BOOL=OFF - -DBUILD_SHARED:BOOL=OFF - DEPENDENCIES ${LIBNIFALCON_DEPENDENCIES} - RELATIVE_INCLUDE_PATH "include/ftd2xx" - #VERBOSE -) diff --git a/CMake/External/External_VRPN.cmake b/CMake/External/External_VRPN.cmake index 7908bc3e03f13512c6892001de7131cb9780d52c..bbe46885a55cfa4a387a042f1138736bf5c1ff7d 100644 --- a/CMake/External/External_VRPN.cmake +++ b/CMake/External/External_VRPN.cmake @@ -13,10 +13,9 @@ endif() #----------------------------------------------------------------------------- # Dependencies #----------------------------------------------------------------------------- -set(VRPN_DEPENDENCIES "LibNiFalcon") +set(VRPN_DEPENDENCIES "") if(WIN32) list(APPEND VRPN_DEPENDENCIES "Libusb") - list(APPEND VRPN_DEPENDENCIES "FTD2XX") endif(WIN32) if(VRPN_USE_OpenHaptics) list(APPEND VRPN_DEPENDENCIES "OpenHaptics") diff --git a/CMake/FindFTD2XX.cmake b/CMake/FindFTD2XX.cmake deleted file mode 100644 index c8b94479ff918435cada73aa280781acdb84ba2b..0000000000000000000000000000000000000000 --- a/CMake/FindFTD2XX.cmake +++ /dev/null @@ -1,11 +0,0 @@ -include(imstkFind) -#----------------------------------------------------------------------------- -# Find All Headers and Libraries for FTD2XX -#----------------------------------------------------------------------------- - -imstk_find_header(FTD2XX ftd2xx.h ftd2xx) -imstk_find_libary(FTD2XX ftd2xx " ")#Use same library for debug) -imstk_find_package(FTD2XX FTD2XX::FTD2XX) - -#message(STATUS "FTD2XX include : ${FTD2XX_INCLUDE_DIRS}") -#message(STATUS "FTD2XX libraries : ${FTD2XX_LIBRARIES}") diff --git a/CMake/FindLibNiFalcon.cmake b/CMake/FindLibNiFalcon.cmake deleted file mode 100644 index 044f1062c5bddbd3342c6645bb9e7ab8e11ff798..0000000000000000000000000000000000000000 --- a/CMake/FindLibNiFalcon.cmake +++ /dev/null @@ -1,12 +0,0 @@ -include(imstkFind) -#----------------------------------------------------------------------------- -# Find All Headers and Libraries for LibNifalcon -#----------------------------------------------------------------------------- - -imstk_find_header(LibNiFalcon falcon/core/FalconCore.h) -imstk_find_libary(LibNiFalcon nifalcon) -imstk_find_package(LibNiFalcon LibNiFalcon::LibNiFalcon) - -#message(STATUS "LibNiFalcon include : ${LibNiFalcon_INCLUDE_DIRS}") -#message(STATUS "LibNiFalcon libraries : ${LibNiFalcon_LIBRARIES}") - diff --git a/CMake/iMSTKConfig.cmake.in b/CMake/iMSTKConfig.cmake.in index e2843c3be7584a9e661727bf1f7b784162f9ddb4..26102372d28d4c0cae303d9fdc3e50f87119bae3 100644 --- a/CMake/iMSTKConfig.cmake.in +++ b/CMake/iMSTKConfig.cmake.in @@ -42,11 +42,6 @@ find_dependency( Assimp ) # Eigen3 find_dependency( Eigen3 ) -# FTD2XX -if(WIN32 AND iMSTK_USE_VRPN) - find_dependency( FTD2XX ) -endif() - # g3log find_dependency( g3log ) @@ -62,9 +57,6 @@ if (iMSTK_BUILD_BENCHMARK) endif() if (iMSTK_USE_VRPN) - # LibNiFalcon - find_dependency( LibNiFalcon ) - # Libusb find_dependency( Libusb ) endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ad600113af1e36534230ae4f8eefb13c4e180f3..9a58152406f9b2eeec78e8666df7d750908414b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,9 +206,6 @@ if(${PROJECT_NAME}_SUPERBUILD) imstk_define_dependency(Assimp) imstk_define_dependency(Eigen3) imstk_define_dependency(g3log) - if (${PROJECT_NAME}_USE_VRPN) - imstk_define_dependency(LibNiFalcon) - endif() imstk_define_dependency(OpenVR) imstk_define_dependency(TBB) imstk_define_dependency(VegaFEM) @@ -219,7 +216,6 @@ if(${PROJECT_NAME}_SUPERBUILD) if (${PROJECT_NAME}_USE_VRPN) if(WIN32) imstk_define_dependency(Libusb) #for VRPN - imstk_define_dependency(FTD2XX) #for LibNiFalcon endif() imstk_define_dependency(VRPN) endif() @@ -287,17 +283,10 @@ find_package( Assimp REQUIRED ) # Eigen find_package( Eigen3 3.1.2 REQUIRED ) -if(WIN32 AND ${PROJECT_NAME}_USE_VRPN) - # FTD2XX - find_package( FTD2XX REQUIRED ) -endif() - # g3log find_package( g3log REQUIRED ) if (${PROJECT_NAME}_USE_VRPN) - # LibNiFalcon - find_package( LibNiFalcon REQUIRED) # Libusb find_package( Libusb REQUIRED) endif() @@ -560,16 +549,6 @@ set(CONFIG_CODE "${CONFIG_CODE}set(GTest_DIR \"${GTest_DIR}\")\n") set(CONFIG_CODE "${CONFIG_CODE}set(benchmark_DIR \"${benchmark_DIR}\")\n") if(WIN32 AND ${PROJECT_NAME}_USE_VRPN) - set(CONFIG_CODE "${CONFIG_CODE}# Required by FindFTD2XX CMake module used in and provided by the iMSTK project\n") - set(CONFIG_CODE "${CONFIG_CODE}set(FTD2XX_ROOT_DIR \"${FTD2XX_ROOT_DIR}\")\n") - set(CONFIG_CODE "${CONFIG_CODE}set(FTD2XX_LIB_DIR \"${FTD2XX_LIB_DIR}\")\n") - set(CONFIG_CODE "${CONFIG_CODE}# Required by Findlibftd2xx CMake module provided and used by the LibNiFalcon project\n") - set(CONFIG_CODE "${CONFIG_CODE}set(LIBFTD2XX_INCLUDE_DIR \"${LIBFTD2XX_INCLUDE_DIR}\")\n") - set(CONFIG_CODE "${CONFIG_CODE}set(LIBFTD2XX_LIBRARY \"${LIBFTD2XX_LIBRARY}\")\n") - - set(CONFIG_CODE "${CONFIG_CODE}set(LibNiFalcon_ROOT_DIR \"${LibNiFalcon_ROOT_DIR}\")\n") - set(CONFIG_CODE "${CONFIG_CODE}set(LibNiFalcon_LIB_DIR \"${LibNiFalcon_LIB_DIR}\")\n") - set(CONFIG_CODE "${CONFIG_CODE}set(Libusb_ROOT_DIR \"${Libusb_ROOT_DIR}\")\n") set(CONFIG_CODE "${CONFIG_CODE}set(Libusb_LIB_DIR \"${Libusb_LIB_DIR}\")\n") endif()