Commit 54b08e39 authored by Ben Boeckel's avatar Ben Boeckel

paths: update code for new build directories

parent 7df542f5
......@@ -18,7 +18,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"/usr/bin/ranlib: warning for library: .*/libvimt_algo.a"
"src.*smtk.*ThirdParty"
"ld: warning: duplicate dylib"
"paraview/src/paraview-build"
"paraview/build"
"cmb/Source/Omicron"
"/usr/bin/ranlib: file: ../../../../lib/libtl_alloc.a.* has no symbols"
......@@ -27,7 +27,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"has different visibility .* in .* and hidden in .*vtkInitializationHelper"
"has different visibility .* in .* and hidden in .*CMakeFiles/pqCore.dir/"
"src/.*-build/.*/doc"
"build/.*/doc"
#Shiboken
"CMakeFiles/shiboken.dir"
......@@ -38,7 +38,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"clang: warning: argument unused during compilation: '-finline-functions'"
#Paraview
"paraview-build/.*/.*/Documentation"
"paraview/build/.*/.*/Documentation"
#vxl
"install/include/vxl"
......@@ -77,7 +77,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"qmutex.h.* : warning C4512:"
"vil3d_dicom.obj : warning LNK4221:"
"install\\\\include"
"shiboken\\\\src\\\\shiboken-build"
"shiboken\\\\build"
"smtk\\\\src\\\\smtk\\\\ThirdParty"
"warning C4996: 'strcpy'"
"warning C4996: 'scanf'"
......@@ -110,7 +110,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"ParaViewCore\\\\ServerImplementation\\\\Core\\\\vtkPVMessage.pb.h"
"paraview\\\\src\\\\paraview\\\\Plugins\\\\H5PartReader\\\\H5Part\\\\src\\\\H5Part.c"
"Applications\\\\ParaView\\\\paraview_main.cxx.* : warning C4996:"
"cmb-build\\\\source\\\\omicron"
"cmb\\\\build\\\\source\\\\omicron"
)
ignore_project_warnings(boost)
......
set(paraview_dir ${CMAKE_CURRENT_BINARY_DIR}/paraview/src/paraview-build)
set(paraview_dir ${CMAKE_CURRENT_BINARY_DIR}/paraview/build)
set(vtk_dir ${paraview_dir}/VTK)
if (__BUILDBOT_INSTALL_LOCATION)
......
......@@ -6,7 +6,7 @@ opencvcontrib
numpy
CMAKE_ARGS
-DOPENCV_EXTRA_MODULES_PATH:PATH=${CMAKE_CURRENT_BINARY_DIR}/opencvcontrib/src/opencvcontrib/modules
-DOPENCV_EXTRA_MODULES_PATH:PATH=${CMAKE_CURRENT_BINARY_DIR}/opencvcontrib/src/modules
-DBUILD_opencv_hdf:BOOL=OFF
-DBUILD_opencv_dnn:BOOL=OFF
-DWITH_CUDA:BOOL=OFF
......
set(paraview_dir ${CMAKE_CURRENT_BINARY_DIR}/paraview/src/paraview-build)
set(paraview_dir ${CMAKE_CURRENT_BINARY_DIR}/paraview/build)
if (__BUILDBOT_INSTALL_LOCATION)
set(paraview_dir <INSTALL_DIR>/lib/cmake/paraview-${paraview_version})
......
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