Commit 4f7bdd40 authored by Gabriel Devillers's avatar Gabriel Devillers
Browse files

Common superbuild working on windows with VS2015

- (only) Qt must be provided manually (this is a first step)
- The main change is that VeloView now uses Boost as dynamic lib on
Windows. It was far simpler to do that because at least one other
dependancy (liblas) is using boost as dynamic lib so it would mean
either updating the common superbuild to build *both* or updating
the superbuild to make these dependencies use boost static.

Prepare build with:
cmake c:\VeloView-kwinternal\Superbuild -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo
-DUSE_SYSTEM_qt5=True -DQt5_DIR="C:/Qt/Qt5.10.0/5.10.0/msvc2015_64/lib/cmake/Qt5"
-Dqt_version=5

Then build with:
ninja -jN
(like with make you can go to any previously built target build directory and
run ninja inside of it, to skip passing on dependancies that you now have not
changed)

Remarks:
- forward slashes might be mandatory in Qt5_DIR
- qt_version should be kept for now because paraview 5.4.0 should be
able tolbuild also with Qt4
- disabled unused qtspeech to build with VS Express

To run this build on another machine you will also need to copy some DLLs of
Qt system:
/c/Qt/Qt5.10.0/5.10.0/msvc2015_64/bin/{Qt5Core.dll,Qt5Gui.dll,Qt5Widgets.dll,
Qt5Help.dll,Qt5Network.dll,Qt5PrintSupport.dll,Qt5Sql.dll,libEGL.dll,
libEGLd.dll} ->  "$build_dir/install/bin"

and:
/c/Qt/Qt5.10.0/5.10.0/msvc2015_64/plugins/platforms/{qwindows.dll,qwindowsd.dll}
-> "$build_dir/install/bin/platforms"
parent c48fef4a
......@@ -95,6 +95,7 @@ endif()
# skiped module as defined in paraview superbuild.
# One difference: pythonQt needs Multimedia so we don't skip it.
set(qt5_skip_modules
qtspeech
qtconnectivity
qtgamepad
qtlocation
......
......@@ -11,3 +11,11 @@ superbuild_add_project(veloview
-DCMAKE_CXX_STANDARD:STRING=${CMAKE_CXX_STANDARD}
-Dqt_version:STRING=${qt_version}
)
if (WIN32)
# These options are useful to use Boost as a dynamic library.
# Boost_USE_STATIC_LIBS is off by default, but sometimes that is not sufficient
# on windows (especially with MSVC ?)
superbuild_append_flags(cxx_flags "-DBOOST_ALL_NO_LIB" PROJECT_ONLY)
superbuild_append_flags(cxx_flags "-DBOOST_ALL_DYN" PROJECT_ONLY)
endif()
......@@ -9,7 +9,7 @@
# endif()
superbuild_set_revision(pythonqt
GIT_REPOSITORY git://github.com/commontk/PythonQt.git
GIT_REPOSITORY http://github.com/commontk/PythonQt.git
GIT_TAG patched-8)
set(PARAVIEW_VERSION 5.4)
......@@ -23,7 +23,7 @@ superbuild_set_revision(veloview
if (WIN32)
superbuild_set_revision(pcap
GIT_REPOSITORY git://github.com/patmarion/winpcap.git
GIT_REPOSITORY http://github.com/patmarion/winpcap.git
GIT_TAG master)
else()
superbuild_set_revision(pcap
......
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