address ambiguous namespace issue for VS2017 builds of the tools

also fix one more place where the compiler should not be set
by Trilinos for downstream external projects

Author: dicengine

tests/examples/CMakeLists.txt

@@ -56,7 +56,7 @@ ExternalProject_Add(custom_app_example
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/custom_app
   BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/custom_app/build
   TMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/utils_tmp
-  CMAKE_CACHE_ARGS -DDICE_LIB_DIR:STRING=${DICE_OUTPUT_PREFIX}/lib -DDICE_HEADER_DIR:STRING=${DICE_HEADER_DIRS} -DDICE_TRILINOS_DIR:STRING=${DICE_TRILINOS_DIR} -DTIFF_DIR:STRING=${TIFF_DIR} -DJPEG_DIR:STRING=${JPEG_DIR} -DPNG_DIR:STRING=${PNG_DIR}  -DDICE_ENABLE_MANYCORE:BOOL=${DICE_ENABLE_MANYCORE} -DOpenCV_DIR:STRING=${OpenCV_DIR} -DDICE_ENABLE_GLOBAL:BOOL=${DICE_ENABLE_GLOBAL} -DNetCDF_DIR:STRING=${NetCDF_DIR} -DHDF5_DIR:STRING=${HDF5_DIR} -DDICE_USE_DOUBLE:BOOL=${DICE_USE_DOUBLE}-DDICE_MPI:BOOL=${DICE_MPI} -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS} )
+  CMAKE_CACHE_ARGS -DDICE_LIB_DIR:STRING=${DICE_OUTPUT_PREFIX}/lib -DDICE_HEADER_DIR:STRING=${DICE_HEADER_DIRS} -DDICE_TRILINOS_DIR:STRING=${DICE_TRILINOS_DIR} -DTIFF_DIR:STRING=${TIFF_DIR} -DJPEG_DIR:STRING=${JPEG_DIR} -DPNG_DIR:STRING=${PNG_DIR}  -DDICE_ENABLE_MANYCORE:BOOL=${DICE_ENABLE_MANYCORE} -DOpenCV_DIR:STRING=${OpenCV_DIR} -DDICE_ENABLE_GLOBAL:BOOL=${DICE_ENABLE_GLOBAL} -DNetCDF_DIR:STRING=${NetCDF_DIR} -DHDF5_DIR:STRING=${HDF5_DIR} -DDICE_USE_DOUBLE:BOOL=${DICE_USE_DOUBLE}-DDICE_MPI:BOOL=${DICE_MPI} -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER} -DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS} )
 
   # force rebuild of custom_app example
   ExternalProject_Add_Step(custom_app_example forcebuild

tests/examples/custom_app/CMakeLists.txt

@@ -34,8 +34,6 @@ MESSAGE("   Trilinos_TPL_LIBRARIES = ${Trilinos_TPL_LIBRARIES}")
 MESSAGE("   Trilinos_TPL_LIBRARY_DIRS = ${Trilinos_TPL_LIBRARY_DIRS}")
 MESSAGE("   Trilinos_BUILD_SHARED_LIBS = ${Trilinos_BUILD_SHARED_LIBS}")
 MESSAGE("End of Trilinos details\n")
-SET(CMAKE_CXX_COMPILER ${Trilinos_CXX_COMPILER} )
-SET(CMAKE_C_COMPILER ${Trilinos_C_COMPILER} )
 SET(CMAKE_VERBOSE_MAKEFILE OFF)
 LIST(FIND Trilinos_TPL_LIST MPI MPI_List_ID)
 IF (MPI_List_ID GREATER -1)

tools/DICe_TrackingMovieMaker.cpp

@@ -269,7 +269,7 @@ int main(int argc, char *argv[]) {
     std::stringstream cine_ss;
     cine_ss << trimmed_cine_name << "_" << frame << ".cine";
     DEBUG_MSG("Loading cine image " << cine_ss.str());
-    Mat mat_img = utils::read_image(cine_ss.str().c_str());
+    Mat mat_img = DICe::utils::read_image(cine_ss.str().c_str());
     Mat out_img(mat_img.size(), CV_8UC3);
     cvtColor(mat_img, out_img, cv::COLOR_GRAY2RGB);