Commit 0272556e authored by whitlocb's avatar whitlocb

These changes let ice-t enabled compute engines work from a simulation.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@13514 18c085ea-50e0-402c-830e-de6fd14e8384
parent b59791cc
......@@ -50,7 +50,7 @@ ${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${ICET_LIBRARY_DIR} )
ADD_LIBRARY(ISimV1Database ${LIBI_SOURCES})
TARGET_LINK_LIBRARIES(ISimV1Database visitcommon)
......
......@@ -3,6 +3,9 @@
<FilePatterns>
*.sim1
</FilePatterns>
<LDFLAGS>
${ICET_LIBRARY_DIR}
</LDFLAGS>
<Attribute name="" purpose="" persistent="false" exportAPI="" exportInclude="">
</Attribute>
</Plugin>
......@@ -56,7 +56,7 @@ ${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${ICET_LIBRARY_DIR} )
ADD_LIBRARY(ISimV2Database ${LIBI_SOURCES})
TARGET_LINK_LIBRARIES(ISimV2Database visitcommon)
......
......@@ -8,6 +8,9 @@
${VISIT_INCLUDE_DIR}/sim/V2/runtime
${MESA_INCLUDE_DIR}
</CXXFLAGS>
<LDFLAGS>
${ICET_LIBRARY_DIR}
</LDFLAGS>
<LIBS>
${TESSELLATION_LIBRARY}
</LIBS>
......
......@@ -226,6 +226,7 @@ IF(VISIT_PARALLEL)
avtviswindow_par
avtpipeline_par
cognomen
${ICET_LIB}
)
IF(VISIT_NOLINK_MPI_WITH_LIBRARIES)
......@@ -255,7 +256,6 @@ IF(VISIT_PARALLEL)
vtkftgl
${ALL_THIRDPARTY_IO_LIB}
${TCMALLOC_LIB}
${ICET_LIB}
${CMAKE_THREAD_LIBS}
${ZLIB_LIB}
)
......
......@@ -82,7 +82,13 @@ ${VISIT_SOURCE_DIR}/engine/proxy
${VISIT_SOURCE_DIR}/engine/rpc
)
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR} ${VTK_LIBRARY_DIRS})
LINK_DIRECTORIES(
${LIBRARY_OUTPUT_DIRECTORY}
${MESA_LIBRARY_DIR}
${GLEW_LIBRARY_DIR}
${VTK_LIBRARY_DIRS}
${ICET_LIBRARY_DIR}
)
ADD_LIBRARY(visitenginev1_ser ${LIBSIM_RUNTIME_SOURCES})
TARGET_LINK_LIBRARIES(visitenginev1_ser
......
......@@ -108,7 +108,13 @@ ${VISIT_SOURCE_DIR}/engine/rpc
${VISIT_SOURCE_DIR}/sim/V2/lib
)
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR} ${VTK_LIBRARY_DIRS})
LINK_DIRECTORIES(
${LIBRARY_OUTPUT_DIRECTORY}
${MESA_LIBRARY_DIR}
${GLEW_LIBRARY_DIR}
${VTK_LIBRARY_DIRS}
${ICET_LIBRARY_DIR}
)
ADD_LIBRARY(simV2runtime_ser ${LIBSIM_RUNTIME_SOURCES})
TARGET_LINK_LIBRARIES(simV2runtime_ser
......
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