Commit 04ac21a3 authored by Sreekanth Arikatla's avatar Sreekanth Arikatla

REFAC: Move utilities out of core library

parent 02269740
...@@ -324,6 +324,7 @@ add_subdirectory(Source/Scene) ...@@ -324,6 +324,7 @@ add_subdirectory(Source/Scene)
add_subdirectory(Source/SimulationManager) add_subdirectory(Source/SimulationManager)
add_subdirectory(Source/Constraint) add_subdirectory(Source/Constraint)
add_subdirectory(Source/Animation) add_subdirectory(Source/Animation)
add_subdirectory(Source/apiUtilities)
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
# Export Targets # Export Targets
......
...@@ -35,10 +35,12 @@ if(iMSTK_USE_OMNI) ...@@ -35,10 +35,12 @@ if(iMSTK_USE_OMNI)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
if(UNIX) if(UNIX)
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
SimulationManager) SimulationManager
apiUtils)
else() else()
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
SimulationManager SimulationManager
apiUtils
SFML) SFML)
endif() endif()
......
...@@ -32,7 +32,7 @@ if(iMSTK_USE_OMNI) ...@@ -32,7 +32,7 @@ if(iMSTK_USE_OMNI)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtils)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add shaders # Add shaders
......
...@@ -41,4 +41,4 @@ CopyAndCompileShaders() ...@@ -41,4 +41,4 @@ CopyAndCompileShaders()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples) ...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add shaders # Add shaders
......
...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples) ...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add shaders # Add shaders
......
...@@ -37,4 +37,4 @@ CopyAndCompileShaders() ...@@ -37,4 +37,4 @@ CopyAndCompileShaders()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
\ No newline at end of file \ No newline at end of file
...@@ -33,7 +33,7 @@ if(iMSTK_USE_Vulkan) ...@@ -33,7 +33,7 @@ if(iMSTK_USE_Vulkan)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtils)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add shaders # Add shaders
......
...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples) ...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add shaders # Add shaders
......
...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples) ...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add shaders # Add shaders
......
...@@ -37,4 +37,4 @@ CopyAndCompileShaders() ...@@ -37,4 +37,4 @@ CopyAndCompileShaders()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
\ No newline at end of file \ No newline at end of file
...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples) ...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add shaders # Add shaders
......
...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples) ...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add shaders # Add shaders
......
...@@ -37,4 +37,4 @@ CopyAndCompileShaders() ...@@ -37,4 +37,4 @@ CopyAndCompileShaders()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
\ No newline at end of file \ No newline at end of file
...@@ -38,6 +38,6 @@ if(iMSTK_USE_OMNI) ...@@ -38,6 +38,6 @@ if(iMSTK_USE_OMNI)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtils)
endif() endif()
\ No newline at end of file
...@@ -37,5 +37,5 @@ CopyAndCompileShaders() ...@@ -37,5 +37,5 @@ CopyAndCompileShaders()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
...@@ -37,4 +37,4 @@ CopyAndCompileShaders() ...@@ -37,4 +37,4 @@ CopyAndCompileShaders()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
...@@ -37,4 +37,4 @@ CopyAndCompileShaders() ...@@ -37,4 +37,4 @@ CopyAndCompileShaders()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
\ No newline at end of file \ No newline at end of file
...@@ -37,7 +37,7 @@ CopyAndCompileShaders() ...@@ -37,7 +37,7 @@ CopyAndCompileShaders()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Associate external data # Associate external data
......
...@@ -37,7 +37,7 @@ CopyAndCompileShaders() ...@@ -37,7 +37,7 @@ CopyAndCompileShaders()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Associate external data # Associate external data
......
...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples) ...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add shaders # Add shaders
......
...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples) ...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add shaders # Add shaders
......
...@@ -31,4 +31,4 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples) ...@@ -31,4 +31,4 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
\ No newline at end of file \ No newline at end of file
...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples) ...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add shaders # Add shaders
......
...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples) ...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add shaders # Add shaders
......
...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples) ...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add shaders # Add shaders
......
...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples) ...@@ -31,7 +31,7 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add shaders # Add shaders
......
...@@ -31,4 +31,4 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples) ...@@ -31,4 +31,4 @@ SET_TARGET_PROPERTIES (${PROJECT_NAME} PROPERTIES FOLDER Examples)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
\ No newline at end of file \ No newline at end of file
...@@ -37,4 +37,4 @@ CopyAndCompileShaders() ...@@ -37,4 +37,4 @@ CopyAndCompileShaders()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
\ No newline at end of file \ No newline at end of file
...@@ -37,4 +37,4 @@ CopyAndCompileShaders() ...@@ -37,4 +37,4 @@ CopyAndCompileShaders()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to executable # Link libraries to executable
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
target_link_libraries(${PROJECT_NAME} SimulationManager) target_link_libraries(${PROJECT_NAME} SimulationManager apiUtilities)
\ No newline at end of file \ No newline at end of file
#-----------------------------------------------------------------------------
# Create target
#-----------------------------------------------------------------------------
include(imstkAddLibrary)
imstk_add_library(apiUtilities
DEPENDS
Core
SimulationManager
Scene
)
#-----------------------------------------------------------------------------
# Testing
#-----------------------------------------------------------------------------
if( iMSTK_BUILD_TESTING )
add_subdirectory( Testing )
endif()
\ No newline at end of file
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