Commit b00223d6 authored by Aaron Bray's avatar Aaron Bray
Browse files

Fixing issues from building on Linux

parent 66ab84bf
......@@ -68,7 +68,6 @@ ExternalProject_Include_Dependencies( ${PROJECT_NAME}
ExternalProject_Add( ${PROJECT_NAME}
${${PROJECT_NAME}_EP_ARGS}
DOWNLOAD_COMMAND ""
INSTALL_COMMAND ""
SOURCE_DIR ${${PROJECT_NAME}_SOURCE_DIR}
BINARY_DIR ${CMAKE_BINARY_DIR}/Innerbuild
CMAKE_ARGS
......
......@@ -13,11 +13,19 @@ set(copy_sccd_headers_command
${SCCD_SOURCE_DIR}/inc
${CMAKE_INSTALL_PREFIX}/include
)
set(copy_sccd_lib_command
${CMAKE_COMMAND} -E copy
${SCCD_BINARY_DIR}/src/${config_dir}/sccd$<$<CONFIG:Debug>:d>.lib
${CMAKE_INSTALL_PREFIX}/lib
)
if(WIN32)
set(copy_sccd_lib_command
${CMAKE_COMMAND} -E copy
${SCCD_BINARY_DIR}/src/${config_dir}/sccd$<$<CONFIG:Debug>:d>.lib
${CMAKE_INSTALL_PREFIX}/lib
)
else()
set(copy_sccd_lib_command
${CMAKE_COMMAND} -E copy
${SCCD_BINARY_DIR}/src/${config_dir}/libsccd$<$<CONFIG:Debug>:d>.a
${CMAKE_INSTALL_PREFIX}/lib
)
endif()
imstk_add_external_project( SCCD
......
......@@ -2,7 +2,11 @@
# Add External Project
#-----------------------------------------------------------------------------
set(pre "lib")
set(ext "a")
if(MSVC)
set(pre "")
set(ext "lib")
set(config_dir "$(Configuration)")
endif()
......@@ -15,7 +19,7 @@ imstk_add_external_project( g3log
-DADD_FATAL_EXAMPLE:BOOL=OFF
INSTALL_COMMAND
COMMAND ${CMAKE_COMMAND} -E copy_directory ${g3log_SOURCE_DIR}/src/g3log ${CMAKE_INSTALL_PREFIX}/include/g3log
COMMAND ${CMAKE_COMMAND} -E copy ${g3log_BINARY_DIR}/${config_dir}/g3logger$<$<CONFIG:Debug>:d>.lib ${CMAKE_INSTALL_PREFIX}/lib/
COMMAND ${CMAKE_COMMAND} -E copy ${g3log_BINARY_DIR}/${config_dir}/${pre}g3logger$<$<CONFIG:Debug>:d>.${ext} ${CMAKE_INSTALL_PREFIX}/lib/
RELATIVE_INCLUDE_PATH "src"
DEPENDENCIES ""
#VERBOSE
......
......@@ -7,7 +7,7 @@ imstk_find_header(SCCD ccdAPI.h)
if(WIN32)
imstk_find_libary(SCCD sccd)
else()
imstk_find_libary(SCCD libassimp)
imstk_find_libary(SCCD sccd)
endif()
imstk_find_package(SCCD)
......
......@@ -46,9 +46,7 @@ function(CopyAndCompileShaders)
file(COPY ${PROJECT_BINARY_DIR}/Shaders/VulkanShaders
DESTINATION ${CMAKE_PROGRAM_PATH}/Shaders)
else( iMSTK_USE_Vulkan )
file(COPY ${CMAKE_SOURCE_DIR}/Source/Rendering/VTKRenderer/VTKShaders
DESTINATION ${PROJECT_BINARY_DIR}/Shaders)
file(COPY ${CMAKE_SOURCE_DIR}/Source/Rendering/VTKRenderer/VTKShaders
DESTINATION ${CMAKE_PROGRAM_PATH}/Shaders)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Source/Rendering/VTKRenderer/VTKShaders
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/Shaders)
endif()
endfunction()
\ No newline at end of file
......@@ -185,8 +185,10 @@ include(imstkFind)
find_package( Assimp REQUIRED )
# Eigen
find_package( Eigen 3.1.2 REQUIRED )
# FTD2XX
find_package( FTD2XX REQUIRED )
if(WIN32)
# FTD2XX
find_package( FTD2XX REQUIRED )
endif()
# g3log
find_package( g3log REQUIRED )
# glm
......
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