Commit 7bc37205 authored by Aaron Bray's avatar Aaron Bray
Browse files

ENH: Ensure all dependencies install headers to their own folder

parent 023be85c
......@@ -21,7 +21,7 @@ endif()
set(copy_ftd2xx_headers_command
${CMAKE_COMMAND} -E copy
${FTD2XX_EXTRACT_DIR}/ftd2xx.h
${CMAKE_INSTALL_PREFIX}/include/ftd2xx.h
${CMAKE_INSTALL_PREFIX}/include/ftd2xx/ftd2xx.h
)
set(copy_ftd2xx_lib_command
${CMAKE_COMMAND} -E copy
......
......@@ -16,6 +16,6 @@ imstk_add_external_project( LibNiFalcon
-DBUILD_SWIG_BINDINGS:BOOL=OFF
-DBUILD_SHARED:BOOL=OFF
DEPENDENCIES ${LIBNIFALCON_DEPENDENCIES}
RELATIVE_INCLUDE_PATH "include"
RELATIVE_INCLUDE_PATH "include/ftd2xx"
#VERBOSE
)
\ No newline at end of file
......@@ -4,7 +4,8 @@
include(imstkAddExternalProject)
imstk_add_external_project( PThreads
GIT_REPOSITORY https://gitlab.kitware.com/iMSTK/libpthread.git
GIT_TAG 26bdc33be9786a9ffbfcec806c857ea208c37201
GIT_TAG 660654b332126834a20db43ca649e43fdcd32016
# This is the iMSTK branch
CMAKE_CACHE_ARGS
-DBUILD_TESTING:BOOL=OFF
RELATIVE_INCLUDE_PATH "include"
......
......@@ -11,7 +11,7 @@ endif()
set(copy_sccd_headers_command
${CMAKE_COMMAND} -E copy_directory
${SCCD_SOURCE_DIR}/inc
${CMAKE_INSTALL_PREFIX}/include
${CMAKE_INSTALL_PREFIX}/include/sccd
)
if(WIN32)
set(copy_sccd_lib_command
......
......@@ -32,7 +32,8 @@ endif()
include(imstkAddExternalProject)
imstk_add_external_project( VRPN
GIT_REPOSITORY https://gitlab.kitware.com/iMSTK/vrpn.git
GIT_TAG ae5672fc163d9753ac9fa559b5c862ed9e32e6ff
GIT_TAG d7b36581721e0b13a9699eac6f0ea698f0a1c830
# This is the improve-openhaptics-rebase branch
CMAKE_CACHE_ARGS
-DBUILD_TESTING:BOOL=OFF
-DVRPN_SUBPROJECT_BUILD:BOOL=ON
......
......@@ -8,8 +8,6 @@ if(${${PROJECT_NAME}_ENABLE_VR})
set(VTK_ENABLE_OPENVR "YES")
endif()
message(STATUS "iMSTK_ENABLE_VR : ${${PROJECT_NAME}_ENABLE_VR}")
#-----------------------------------------------------------------------------
# Add External Project
#-----------------------------------------------------------------------------
......
......@@ -33,7 +33,7 @@ endif()
set(copy_openvr_headers_command
${CMAKE_COMMAND} -E copy_directory
${OPENVR_EXTRACT_DIR}/headers
${CMAKE_INSTALL_PREFIX}/include
${CMAKE_INSTALL_PREFIX}/include/openvr
)
set(copy_openvr_dll_command
${CMAKE_COMMAND} -E copy
......
......@@ -3,7 +3,7 @@ include(imstkFind)
# Find All Headers and Libraries for FTD2XX
#-----------------------------------------------------------------------------
imstk_find_header(FTD2XX ftd2xx.h)
imstk_find_header(FTD2XX ftd2xx.h ftd2xx)
imstk_find_libary(FTD2XX ftd2xx " ")#Use same library for debug)
imstk_find_package(FTD2XX)
......
......@@ -3,7 +3,7 @@ include(imstkFind)
# Find All Headers and Libraries for glm
#-----------------------------------------------------------------------------
imstk_find_header(PThreads pthread.h)
imstk_find_header(PThreads pthread.h pthread)
imstk_find_libary(PThreads pthread)
imstk_find_package(PThreads Threads::Threads)
......
......@@ -3,12 +3,8 @@ include(imstkFind)
# Find All Headers and Libraries for SCCD
#-----------------------------------------------------------------------------
imstk_find_header(SCCD ccdAPI.h)
if(WIN32)
imstk_find_libary(SCCD sccd)
else()
imstk_find_libary(SCCD sccd)
endif()
imstk_find_header(SCCD ccdAPI.h sccd)
imstk_find_libary(SCCD sccd)
imstk_find_package(SCCD)
#message(STATUS "SCCD include : ${SCCD_INCLUDE_DIRS}")
......
......@@ -3,7 +3,7 @@ include(imstkFind)
# Find All Headers and Libraries for VRPN
#-----------------------------------------------------------------------------
imstk_find_header(VRPN vrpn_Configure.h)
imstk_find_header(VRPN vrpn_Configure.h vrpn)
imstk_find_libary(VRPN vrpn)#Use same library for debug
imstk_find_package(VRPN)
......
......@@ -3,7 +3,7 @@ include(imstkFind)
# Find All Headers and Libraries for openvr
#-----------------------------------------------------------------------------
imstk_find_header(openvr openvr.h)
imstk_find_header(openvr openvr.h openvr)
imstk_find_libary(openvr openvr_api " ")#Use same library for debug
imstk_find_package(openvr)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment