Updates will be applied April 15th at 12pm EDT (UTC-0400). GitLab could be a little slow between 12 - 12:45pm EDT.

Commit 606fa334 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'cmb-windows-install'

77baffd5 superbuild: use regexes for project warnings
5dba78c2 boost: avoid sourceforge
79e80f65 projects: remove unused cmake files
2f3c9b31 superbuild: honor depends for dummy projects
eabdb7e2 win32: use zlib, bzip2, and freetype from python tarball
c4ed6396 win32: respin windows tarballs
b90c7ba2 win32: remove the matplotlib and numpy blocks
029dfbd5 win32: remove the mpich block
...
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !58
parents 8613e248 77baffd5
......@@ -221,7 +221,7 @@ function(add_external_developer_project_internal name)
endforeach()
#add a dummy project that is needed by the _ep_write_initial_cache
add_external_dummy_project_internal_with_depends(${name} "${arg_DEPENDS}")
add_external_dummy_project_internal(${name})
#write out all the cmake vars to a file that can be used to prime a build
set(cache_file "${SuperBuild_BINARY_DIR}/${name}-Developer-Config.cmake")
......
set( CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 1000 )
set( CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 1000 )
macro (ignore_project_warnings project)
list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"${project}/src/${project}"
"${project}\\\\src\\\\${project}")
string(TOLOWER "${project}" lower_project)
if ((APPLE OR WIN32) AND (NOT lower_project STREQUAL project))
if (WIN32)
list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"${lower_project}\\\\src\\\\${lower_project}")
else ()
list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"${lower_project}/src/${lower_project}")
endif ()
endif ()
endmacro ()
##------------------------------------------------------------------------------
## Regular expression for warning exception during build process
set (CTEST_CUSTOM_WARNING_EXCEPTION
${CTEST_CUSTOM_WARNING_EXCEPTION}
"-jN forced in submake: disabling jobserver mode"
"thirdparty/qt5json"
"kml/src/kml"
"molequeue/src/molequeue"
"/usr/bin/libtool"
"/usr/bin/ranlib: file: .*/libtiff.a"
"/usr/bin/ranlib: warning for library: .*/libvil3d_io.a"
......@@ -19,9 +33,6 @@ set (CTEST_CUSTOM_WARNING_EXCEPTION
"cmb/Source/Omicron"
"/usr/bin/ranlib: file: ../../../../lib/libtl_alloc.a.* has no symbols"
"szip/src/szip"
"hdf5/src/hdf5"
"H5LTanalyze.c"
"has different visibility .* in .* and hidden in .*vtkInitializationHelper"
......@@ -29,11 +40,6 @@ set (CTEST_CUSTOM_WARNING_EXCEPTION
"src/.*-build/.*/doc"
#boost
"boost/src/boost"
"threading-multi/windows_file_codecvt.o"
"threading-multi/thread_clock.o"
#Shiboken
"shiboken/src/shiboken"
"CMakeFiles/shiboken.dir"
......@@ -54,14 +60,6 @@ set (CTEST_CUSTOM_WARNING_EXCEPTION
"/usr/bin/ranlib: file: .*libvimt_algo.a"
#windows
"boost\\\\src\\\\boost"
"zeroMQ\\\\src\\\\zeroMQ"
"zeromq\\\\src\\\\zeromq"
"szip\\\\src\\\\szip"
"hdf5\\\\src\\\\hdf5"
"png\\\\src\\\\png"
"kml\\\\src\\\\kml"
"matplotlib\\\\src\\\\matplotlib"
"warning C4244: .* : conversion from 'Py_ssize_t' to .*, possible loss of data"
"warning C4244: .* : conversion from 'INT_PTR' to 'int', possible loss of data"
"src/ft2font.cpp.* : warning C4267:"
......@@ -69,14 +67,6 @@ set (CTEST_CUSTOM_WARNING_EXCEPTION
"..\\\\Python\\\\"
"..\\\\Parser\\\\"
"tss_dll.obj : warning LNK4221:"
"vxl\\\\src\\\\vxl"
"vbl_qsort.obj.*warning LNK4221"
"vcl_vector.*.obj.*warning LNK4221"
"vsl_vector_io.*.obj.*warning LNK4221"
"vbl_io_.*.obj.*warning LNK4221"
"vnl_io_.*obj.*warning LNK4221"
"vil_io_.*.obj.*warning LNK4221"
"vsl_pair_io.*.obj.*warning LNK4221"
"Modules\\\\zlib\\\\gzio.c"
"Modules\\posixmodule.c"
"Modules\\\\_ctypes\\\\libffi_msvc\\\\ffi.c"
......@@ -133,6 +123,17 @@ set (CTEST_CUSTOM_WARNING_EXCEPTION
"cmb-build\\\\source\\\\omicron"
)
ignore_project_warnings(boost)
ignore_project_warnings(gdal)
ignore_project_warnings(hdf5)
ignore_project_warnings(kml)
ignore_project_warnings(molequeue)
ignore_project_warnings(python)
ignore_project_warnings(qt)
ignore_project_warnings(szip)
ignore_project_warnings(vxl)
ignore_project_warnings(zeroMQ)
# Regular expression for warning exception during build process
# Regular expression for error exceptions during build process
set (CTEST_CUSTOM_ERROR_EXCEPTION
......
......@@ -284,34 +284,16 @@ macro(get_project_depends _name _prefix)
endif()
endmacro()
#------------------------------------------------------------------------------
function(add_external_dummy_project_internal_with_depends name depends)
#we have to set prefix, and install_dir
#as other parts of the code require that even dummy projects have a valid
#install path and prefix
ExternalProject_Add(${name}
DEPENDS "${depends}"
PREFIX ${name}
DOWNLOAD_DIR ${download_location}
INSTALL_DIR ${install_location}
DOWNLOAD_COMMAND ""
SOURCE_DIR ""
UPDATE_COMMAND ""
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
)
endfunction()
#------------------------------------------------------------------------------
function(add_external_dummy_project_internal name)
set(arg_DEPENDS)
get_project_depends("${name}" arg)
#we have to set prefix, and install_dir
#as other parts of the code require that even dummy projects have a valid
#install path and prefix
ExternalProject_Add(${name}
DEPENDS ${arg_DEPENDS}
PREFIX ${name}
DOWNLOAD_DIR ${download_location}
INSTALL_DIR ${install_location}
......
......@@ -182,14 +182,6 @@ if (WIN32)
find_program(NMAKE_PATH nmake)
mark_as_advanced(DEVENV_PATH NMAKE_PATH)
endif()
# Freetype uses its own build system on win32...
find_program(FTJAM_EXECUTABLE jam)
mark_as_advanced(FTJAM_EXECUTABLE)
if (freetype_ENABLED)
if (NOT FTJAM_EXECUTABLE)
message(FATAL_ERROR "FreeType's 'jam' build tool not found! Download it from http://sourceforge.net/projects/freetype/files/ftjam/2.5.2/ and set FTJAM_EXECUTABLE appropriately.")
endif()
endif()
endif()
#-----------------------------------------------------------------------------
include (CMBModules)
......
add_external_project(acusolve
DEPENDS paraview
CMAKE_ARGS
-DParaView_DIR:PATH=${SuperBuild_BINARY_DIR}/paraview/src/paraview-build
INSTALL_COMMAND
${CMAKE_COMMAND} -DBINARY_DIR:PATH=<BINARY_DIR>
-DINSTALL_DIR:PATH=<INSTALL_DIR>
-DPARAVIEW_BINARY_DIR:PATH=${ParaViewSuperBuild_BINARY_DIR}/paraview/src/paraview-build
-DTMP_DIR:PATH=<TMP_DIR>
"-DPLUGIN_SCRIPT:FILEPATH=${CMAKE_CURRENT_LIST_DIR}/plugin-macros.cmake"
"-D7Z_EXE:FILEPATH=${7Z_EXE}"
-Dbundle_name:STRING=${CMAKE_CURRENT_BINARY_DIR}/AcuSolveReaderPlugin
-Dbundle_suffix:STRING=${pv_version_long}-${PACKAGE_SUFFIX}
-P ${CMAKE_CURRENT_LIST_DIR}/install_acusolve.cmake
)
......@@ -25,9 +25,6 @@ add_external_project(boost
BUILD_COMMAND ./b2 ${boost_toolset} address-model=${am} "linkflags=-headerpad_max_install_names" --build-dir=${boost_build_dir} ${boost_with_args}
INSTALL_COMMAND ./b2 ${boost_toolset} address-model=${am} "linkflags=-headerpad_max_install_names" ${boost_with_args} install --prefix=${boost_install_dir}
BUILD_IN_SOURCE 1
LOG_BUILD 1
LOG_INSTALL 1
)
add_extra_cmake_args(
......
......@@ -50,20 +50,3 @@ list(SORT cmb_programs_to_install)
# Don't import CPack yet, let the platform specific code get another chance at
# changing the variables.
# PARAVIEW_INSTALL_MANUAL_PDF is set before importing this file.
# This allows us to override the pdf downloading code for apple.
if (PARAVIEW_INSTALL_MANUAL_PDF)
set (pdf_pv_version "4.0")
# download an install manual pdf.
install(CODE "
# create the doc directory.
file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/doc\")
# download the manual pdf.
file(DOWNLOAD \"http://www.paraview.org/files/v${pdf_pv_version}/ParaViewManual.v${pdf_pv_version}.pdf\"
\"\${CMAKE_INSTALL_PREFIX}/doc/ParaViewManual.v${pv_version}.pdf\"
SHOW_PROGRESS)
")
endif()
add_external_project(cosmologytools
DEPENDS diy qhull paraview
CMAKE_ARGS
-DBUILD_PV_PLUGINS:BOOL=ON
-DBUILD_SHARED_LIBS:BOOL=OFF
-DParaView_DIR:PATH=${ParaViewSuperBuild_BINARY_DIR}/paraview/src/paraview-build
-DDIY_INCLUDE_DIRS:PATH=${ParaViewSuperBuild_BINARY_DIR}/diy/src/diy/include
-DDIY_LIBRARIES:PATH=${ParaViewSuperBuild_BINARY_DIR}/diy/src/diy/lib/libdiy.a
-DQHULL_INCLUDE_DIRS:PATH=${ParaViewSuperBuild_BINARY_DIR}/qhull/src/qhull/src/libqhull
-DQHULL_LIBRARIES:PATH=${ParaViewSuperBuild_BINARY_DIR}/qhull/src/qhull-build/libqhullstatic.a
INSTALL_COMMAND
${CMAKE_COMMAND} -DBINARY_DIR:PATH=<BINARY_DIR>
-DINSTALL_DIR:PATH=<INSTALL_DIR>
-DPARAVIEW_BINARY_DIR:PATH=${ParaViewSuperBuild_BINARY_DIR}/paraview/src/paraview-build
-DTMP_DIR:PATH=<TMP_DIR>
-Dbundle_name:STRING=${CMAKE_CURRENT_BINARY_DIR}/CosmologyToolsPlugin
-Dbundle_suffix:STRING=${pv_version_long}-${PACKAGE_SUFFIX}
-P ${CMAKE_CURRENT_LIST_DIR}/install_cosmologytools.cmake
)
if(WIN32)
message(FATAL_ERROR "CosmoTools is not supported on Windows!")
return()
endif()
if(BUILD_SHARED_LIBS)
set(lib_suffix ${CMAKE_SHARED_LIBRARY_SUFFIX})
else()
set(lib_suffix ${CMAKE_STATIC_LIBRARY_SUFFIX})
endif()
add_external_project(cosmotools
DEPENDS genericio diy qhull
CMAKE_ARGS
-DENABLE_DIY:BOOL=ON
-DENABLE_QHULL:BOOL=ON
-DBUILD_COSMOTOOLS_PROGRAMS:BOOL=OFF
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DBUILD_SIMULATION_INTERFACE:BOOL=OFF
-DBUILD_SINGLE_LIBRARY:BOOL=ON
-DTYPE_IDS_64BITS:BOOL=ON
-DDIY_INCLUDE_DIRS:PATH=${SuperBuild_BINARY_DIR}/diy/src/diy/include
-DDIY_LIBRARIES:PATH=${SuperBuild_BINARY_DIR}/diy/src/diy/lib/libdiy.a
-DQHULL_INCLUDE_DIRS:PATH=${SuperBuild_BINARY_DIR}/qhull/src/qhull/src/libqhull
-DQHULL_LIBRARIES:PATH=${SuperBuild_BINARY_DIR}/qhull/src/qhull-build/libqhullstatic.a
INSTALL_COMMAND
${CMAKE_COMMAND} -E copy <BINARY_DIR>/libs/libcosmotools${lib_suffix} <INSTALL_DIR>/lib
)
# Any project that depends on cosmotools inherits the following cmake args
add_extra_cmake_args(
-DCOSMOTOOLS_INCLUDE_DIR:PATH=${SuperBuild_BINARY_DIR}/cosmotools/src/cosmotools-build/include
-DCOSMOTOOLS_LIBRARIES:PATH=${SuperBuild_BINARY_DIR}/cosmotools/src/cosmotools-build/libs/libcosmotools${lib_suffix}
)
## Builds DIY library
## https://svn.mcs.anl.gov/repos/diy/trunk
if(USE_SYSTEM_mpi)
add_external_project(diy
DEPENDS mpi hdf5
BUILD_IN_SOURCE 1
PROCESS_ENVIRONMENT
MPICC "${MPI_C_COMPILER}"
MPICXX "${MPI_CXX_COMPILER}"
CONFIGURE_COMMAND
<SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --enable-fpic --disable-openmp
BUILD_COMMAND make
INSTALL_COMMAND make install
)
else()
add_external_project(diy
DEPENDS mpi hdf5
BUILD_IN_SOURCE 1
PROCESS_ENVIRONMENT
MPICC "<INSTALL_DIR>/bin/mpicc"
MPICXX "<INSTALL_DIR>/bin/mpicxx"
CONFIGURE_COMMAND
<SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --enable-fpic --disable-openmp
BUILD_COMMAND make
INSTALL_COMMAND make install
)
endif()
# Required because OS X's standard library now has a globally-accessible 'rank'
# symbol (std::__1::rank) which conflicts with the static-global 'rank' in
# diy.cpp.
add_external_project_step(patch_diy_src
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${SuperBuild_PROJECTS_DIR}/patches/diy.src.diy.cpp"
"<SOURCE_DIR>/src/diy.cpp"
DEPENDEES update # do after update
DEPENDERS patch # do before patch
)
if(WIN32)
message(FATAL_ERROR "GenericIO is not supported on Windows!")
return()
endif()
if(BUILD_SHARED_LIBS)
set(lib_suffix ${CMAKE_SHARED_LIBRARY_SUFFIX})
else()
set(lib_suffix ${CMAKE_STATIC_LIBRARY_SUFFIX})
endif()
add_external_project(genericio
DEPENDS mpi
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DBUILD_TESTING:BOOL=OFF
-DBUILD_PROGRAMS:BOOL=OFF
INSTALL_COMMAND
${CMAKE_COMMAND} -E copy <BINARY_DIR>/libGenericIO${lib_suffix} <INSTALL_DIR>/lib
)
# Any project that depends on cosmotools inherits the following cmake args
add_extra_cmake_args(
-DGENERIC_IO_INCLUDE_DIR:PATH=${SuperBuild_BINARY_DIR}/genericio/src/genericio
-DGENERIC_IO_LIBRARIES:PATH=${SuperBuild_BINARY_DIR}/genericio/src/genericio-build/libGenericIO${lib_suffix}
)
......@@ -12,6 +12,4 @@ add_external_project(
-DHDF5_ENABLE_SZIP_ENCODING:BOOL=TRUE
-DHDF5_BUILD_HL_LIB:BOOL=TRUE
-DHDF5_BUILD_WITH_INSTALL_NAME:BOOL=TRUE
LOG_BUILD 1
)
if (APPLE)
set (SHARED_LIBRARY_PREFIX "lib")
set (SHARED_LIBRARY_SUFFIX ".dylib")
elseif (UNIX)
set (SHARED_LIBRARY_PREFIX "lib")
set (SHARED_LIBRARY_SUFFIX ".so")
elseif (WIN32)
set (SHARED_LIBRARY_PREFIX "")
set (SHARED_LIBRARY_SUFFIX ".dll")
endif()
# Remove any old directory
execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory ${TMP_DIR}/AcuSolveReaderPlugin-${bundle_suffix}
WORKING_DIRECTORY ${TMP_DIR}
)
# Create a directory to put the plugin under.
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TMP_DIR}/AcuSolveReaderPlugin-${bundle_suffix}
WORKING_DIRECTORY ${TMP_DIR}
)
# Copy th plugin lib.
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${BINARY_DIR}/${SHARED_LIBRARY_PREFIX}AcuSolveReader${SHARED_LIBRARY_SUFFIX} ${TMP_DIR}/AcuSolveReaderPlugin-${bundle_suffix}
WORKING_DIRECTORY ${TMP_DIR}
)
if (APPLE)
execute_process(
COMMAND ${CMAKE_CURRENT_LIST_DIR}/apple/fixup_plugin.py
# The directory containing the plugin dylibs.
${TMP_DIR}/AcuSolveReaderPlugin-${bundle_suffix}
# names to replace (in order)
"${PARAVIEW_BINARY_DIR}/lib/=@executable_path/../Libraries/"
"${INSTALL_DIR}/lib/Qt=@executable_path/../Frameworks/Qt"
"${INSTALL_DIR}/lib/=@executable_path/../Libraries/"
"libhdf5.7.3.0.dylib=@executable_path/../Libraries/libhdf5.1.8.9.dylib"
"libhdf5_hl.7.3.0.dylib=@executable_path/../Libraries/libhdf5.1.8.9.dylib"
"libcgns.3.1.dylib=@executable_path/../Libraries/libcgns.3.1.dylib"
)
endif()
# make tarball
execute_process(
COMMAND ${CMAKE_COMMAND}
-E tar cvfz ${bundle_name}-${bundle_suffix}.tgz AcuSolveReaderPlugin-${bundle_suffix}
WORKING_DIRECTORY ${TMP_DIR})
if (APPLE)
set (SHARED_LIBRARY_PREFIX "lib")
set (SHARED_LIBRARY_SUFFIX ".dylib")
elseif (UNIX)
set (SHARED_LIBRARY_PREFIX "lib")
set (SHARED_LIBRARY_SUFFIX ".so")
elseif(WIN32)
message(FATAL_ERROR "Not supported on Windows")
endif()
# Remove any old directory.
execute_process(
COMMAND ${CMAKE_COMMAND} -E remove_directory ${TMP_DIR}/CosmologyToolsPlugin-${bundle_suffix}
WORKING_DIRECTORY ${TMP_DIR}
)
# Create a directory to put the plugin under.
execute_process(
COMMAND ${CMAKE_COMMAND} -E make_directory ${TMP_DIR}/CosmologyToolsPlugin-${bundle_suffix}
WORKING_DIRECTORY ${TMP_DIR}
)
# Copy the plugin lib.
execute_process(
COMMAND ${CMAKE_COMMAND} -E copy ${BINARY_DIR}/libs/${SHARED_LIBRARY_PREFIX}PVCosmologyToolsPlugins${SHARED_LIBRARY_SUFFIX} ${TMP_DIR}/CosmologyToolsPlugin-${bundle_suffix}
WORKING_DIRECTORY ${TMP_DIR}
)
if (APPLE)
execute_process(
COMMAND ${CMAKE_CURRENT_LIST_DIR}/apple/fixup_plugin.py
# The directory containing the plugin dylibs or the plugin itself.
${TMP_DIR}/CosmologyToolsPlugin-${bundle_suffix}/${SHARED_LIBRARY_PREFIX}PVCosmologyToolsPlugins${SHARED_LIBRARY_SUFFIX}
# names to replace (in order)
"${PARAVIEW_BINARY_DIR}/lib/=@executable_path/../Libraries/"
"${INSTALL_DIR}/lib/Qt=@executable_path/../Frameworks/Qt"
"${INSTALL_DIR}/lib/=@executable_path/../Libraries/"
"libhdf5.7.3.0.dylib=@executable_path/../Libraries/libhdf5.1.8.9.dylib"
"libhdf5_hl.7.3.0.dylib=@executable_path/../Libraries/libhdf5.1.8.9.dylib"
"libcgns.3.1.dylib=@executable_path/../Libraries/libcgns.3.1.dylib"
)
endif()
execute_process(
COMMAND ${CMAKE_COMMAND}
-E tar cvfz ${bundle_name}-${bundle_suffix}.tgz CosmologyToolsPlugin-${bundle_suffix}
WORKING_DIRECTORY ${TMP_DIR}
)
if (APPLE)
set (SHARED_LIBRARY_PREFIX "lib")
set (SHARED_LIBRARY_SUFFIX ".dylib")
elseif (UNIX)
set (SHARED_LIBRARY_PREFIX "lib")
set (SHARED_LIBRARY_SUFFIX ".so")
elseif (WIN32)
set (SHARED_LIBRARY_PREFIX "")
set (SHARED_LIBRARY_SUFFIX ".dll")
endif()
# Remove any old directory
execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory ${TMP_DIR}/NektarReaderPlugin-${bundle_suffix}
WORKING_DIRECTORY ${TMP_DIR}
)
# Create a directory to put the plugin under.
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TMP_DIR}/NektarReaderPlugin-${bundle_suffix}
WORKING_DIRECTORY ${TMP_DIR}
)
# Copy th plugin lib.
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${BINARY_DIR}/${SHARED_LIBRARY_PREFIX}pvNektarReader${SHARED_LIBRARY_SUFFIX} ${TMP_DIR}/NektarReaderPlugin-${bundle_suffix}
WORKING_DIRECTORY ${TMP_DIR}
)
if (APPLE)
execute_process(
COMMAND ${CMAKE_CURRENT_LIST_DIR}/apple/fixup_plugin.py
# The directory containing the plugin dylibs.
${TMP_DIR}/NektarReaderPlugin-${bundle_suffix}
# names to replace (in order)
"${PARAVIEW_BINARY_DIR}/lib/=@executable_path/../Libraries/"
"${INSTALL_DIR}/lib/Qt=@executable_path/../Frameworks/Qt"
"${INSTALL_DIR}/lib/=@executable_path/../Libraries/"
"libhdf5.7.3.0.dylib=@executable_path/../Libraries/libhdf5.1.8.9.dylib"
"libhdf5_hl.7.3.0.dylib=@executable_path/../Libraries/libhdf5.1.8.9.dylib"
"libcgns.3.1.dylib=@executable_path/../Libraries/libcgns.3.1.dylib"
)
endif()
# make tarball
execute_process(
COMMAND ${CMAKE_COMMAND}
-E tar cvfz ${bundle_name}-${bundle_suffix}.tgz NektarReaderPlugin-${bundle_suffix}
WORKING_DIRECTORY ${TMP_DIR})
if (APPLE)
set (SHARED_LIBRARY_PREFIX "lib")
set (SHARED_LIBRARY_SUFFIX ".dylib")
set (PLUGIN_DIR "lib")
elseif (UNIX)
set (SHARED_LIBRARY_PREFIX "lib")
set (SHARED_LIBRARY_SUFFIX ".so")
set (PLUGIN_DIR "lib")
elseif (WIN32)
set (SHARED_LIBRARY_PREFIX "")
set (SHARED_LIBRARY_SUFFIX ".dll")
set (PLUGIN_DIR "bin")
endif()
execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory ${TMP_DIR}/VisTrailsPlugin-${bundle_suffix})
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TMP_DIR}/VisTrailsPlugin-${bundle_suffix})
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${SOURCE_DIR}/README ${TMP_DIR}/VisTrailsPlugin-${bundle_suffix})
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${BINARY_DIR}/${PLUGIN_DIR}/${SHARED_LIBRARY_PREFIX}VisTrailsPlugin${SHARED_LIBRARY_SUFFIX} ${TMP_DIR}/VisTrailsPlugin-${bundle_suffix})
if (APPLE)
execute_process(
COMMAND ${CMAKE_CURRENT_LIST_DIR}/apple/fixup_plugin.py
# The directory containing the plugin dylibs.
${TMP_DIR}/VisTrailsPlugin-${bundle_suffix}
# names to replace (in order)
"${PARAVIEW_BINARY_DIR}/lib/=@executable_path/../Libraries/"
"${INSTALL_DIR}/lib/Qt=@executable_path/../Frameworks/Qt"
"${INSTALL_DIR}/lib/=@executable_path/../Libraries/"
"libhdf5.7.3.0.dylib=@executable_path/../Libraries/libhdf5.1.8.9.dylib"
"libhdf5_hl.7.3.0.dylib=@executable_path/../Libraries/libhdf5.1.8.9.dylib"
"libcgns.3.1.dylib=@executable_path/../Libraries/libcgns.3.1.dylib"
)
endif()
execute_process(
COMMAND ${CMAKE_COMMAND} -E tar cvfz ${bundle_name}-${bundle_suffix}.tgz VisTrailsPlugin-${bundle_suffix}
WORKING_DIRECTORY ${TMP_DIR})
add_external_project(mili_plugin
DEPENDS paraview
CMAKE_ARGS
-DParaView_DIR:PATH=${SuperBuild_BINARY_DIR}/paraview/src/paraview-build
)
add_external_project(nektar_plugin
DEPENDS paraview
CMAKE_ARGS
-DParaView_DIR:PATH=${SuperBuild_BINARY_DIR}/paraview/src/paraview-build
-DBLAS_atlas_LIBRARY:FILEPATH=/soft/apps/atlas-3.8.2-gcc-shared/lib/libatlas.a
-DBLAS_f77blas_LIBRARY:FILEPATH=/soft/apps/atlas-3.8.2-gcc-shared/lib/libf77blas.a
-DLAPACK_lapack_LIBRARY:FILEPATH=/soft/apps/atlas-3.8.2-gcc-shared/lib/liblapack.a
INSTALL_COMMAND
${CMAKE_COMMAND} -DBINARY_DIR:PATH=<BINARY_DIR>
-DINSTALL_DIR:PATH=<INSTALL_DIR>
-DPARAVIEW_BINARY_DIR:PATH=${ParaViewSuperBuild_BINARY_DIR}/paraview/src/paraview-build
-DTMP_DIR:PATH=<TMP_DIR>
-Dbundle_name:STRING=${CMAKE_CURRENT_BINARY_DIR}/NektarReaderPlugin
-Dbundle_suffix:STRING=${pv_version_long}-${PACKAGE_SUFFIX}
-P ${CMAKE_CURRENT_LIST_DIR}/install_nektar_plugin.cmake
)
## Builds qhull from git://gitorious.org/qhull/qhull.git
add_external_project(
qhull
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>/qhull
INSTALL_COMMAND make install
)
......@@ -25,9 +25,6 @@ add_external_project(boost
BUILD_COMMAND ./b2 ${boost_toolset} --build-dir=${boost_build_dir} address-model=${am} dll-path=${install_location}/lib ${boost_with_args}
INSTALL_COMMAND ./b2 ${boost_toolset} address-model=${am} ${boost_with_args} dll-path=${install_location}/lib install
BUILD_IN_SOURCE 1
LOG_BUILD 1
LOG_INSTALL 1
)
add_extra_cmake_args(
......
add_external_project(vistrails
DEPENDS paraview
CMAKE_ARGS
-DParaView_DIR:PATH=${SuperBuild_BINARY_DIR}/paraview/src/paraview-build
INSTALL_COMMAND
${CMAKE_COMMAND} -DSOURCE_DIR:PATH=<SOURCE_DIR>
-DBINARY_DIR:PATH=<BINARY_DIR>
-DINSTALL_DIR:PATH=<INSTALL_DIR>
-DPARAVIEW_BINARY_DIR:PATH=${ParaViewSuperBuild_BINARY_DIR}/paraview/src/paraview-build
-DTMP_DIR:PATH=<TMP_DIR>
"-DPLUGIN_SCRIPT:FILEPATH=${CMAKE_CURRENT_LIST_DIR}/plugin-macros.cmake"
"-D7Z_EXE:FILEPATH=${7Z_EXE}"
-Dbundle_name:STRING=${CMAKE_CURRENT_BINARY_DIR}/VisTrailsPlugin
-Dbundle_suffix:STRING=${pv_version_long}-${PACKAGE_SUFFIX}
-P ${CMAKE_CURRENT_LIST_DIR}/install_vistrails.cmake
)
......@@ -35,9 +35,6 @@ if(MSVC)
BUILD_COMMAND b2 --build-dir=${boost_build_dir} toolset=${msvc_version} address-model=${am} ${boost_with_args}
INSTALL_COMMAND b2 toolset=${msvc_version} address-model=${am} ${boost_with_args} --prefix=${install_location} install
BUILD_IN_SOURCE 1
LOG_BUILD 1
LOG_INSTALL 1
)
else()
#ninja / mingw has been launched from a shell with the toolset properly specified
......@@ -47,9 +44,6 @@ else()
BUILD_COMMAND b2 --build-dir=${boost_build_dir} address-model=${am} ${boost_with_args}
INSTALL_COMMAND b2 address-model=${am} ${boost_with_args} --prefix=${install_location} install
BUILD_IN_SOURCE 1
LOG_BUILD 1
LOG_INSTALL 1
)