- 23 Oct, 2016 1 commit
-
-
Emmanuel Promayon authored
(forwarded from debian packaging patch) Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
- 17 Oct, 2016 3 commits
-
-
Jean-Loup HABERBUSCH authored
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
-
Jean-Loup HABERBUSCH authored
UPDATED Windows User package is now called camitk_NSIS_Windows_package \nFIXED Application doesn't start due to Qt mandatory files omission in NSIS package on Windows
-
Jean-Loup HABERBUSCH authored
UPDATED CmakeOpenSourcePackaging.cmake to taking into acount the qwindows.dll needed for Qt for Windows_Package_User UPDATED NSIS.Template.in to add platforms directory in deployed structure with qwindows.dll within as needed under Windows OS
-
- 05 Oct, 2016 1 commit
-
-
Jean-Loup HABERBUSCH authored
-
- 29 Sep, 2016 9 commits
-
-
Emmanuel Promayon authored
-
Emmanuel Promayon authored
Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
Emmanuel Promayon authored
Compiling an independant CEP was not possible because of dependencies over some SDK targets Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
Emmanuel Promayon authored
Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
Emmanuel Promayon authored
Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
Emmanuel Promayon authored
Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
Emmanuel Promayon authored
Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
Emmanuel Promayon authored
Inside SDK, allow the dependency Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
Emmanuel Promayon authored
More comment in CamiTKOpenSourcePackaging.cmake The latter is to prevent to redo the same mistakes. The CMake package_source is a default target, that SHOULD NOT be used to produce the CamiTK tarball (otherwise the CamiTKVersion.h is not present, and the version compiled from the source does not have the right version number) Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
- 22 Sep, 2016 2 commits
-
-
Emmanuel Promayon authored
-
Emmanuel Promayon authored
from git repository This is a preparation for fixing bug 106 https://bugzilla-timc.imag.fr/show_bug.cgi?id=106 Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
- 27 Jul, 2016 2 commits
-
-
Emmanuel Promayon authored
-
Emmanuel Promayon authored
This should allow us to fix some problems that occur during merging of hotfix. Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
- 26 Jul, 2016 9 commits
-
-
Emmanuel Promayon authored
-
Emmanuel Promayon authored
Indent 'switch' blocks so that the 'case X:' statements are indented in the switch block Result after adding the --indent-switches option to astyle Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
Emmanuel Promayon authored
Result after adding the --align-pointer=type option to astyle Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
Emmanuel Promayon authored
Result after adding the --pad-header option to astyle Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
Emmanuel Promayon authored
Result after adding the --pad-oper option to astyle Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
Emmanuel Promayon authored
Result after adding the --add-brackets option to astyle Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
Emmanuel Promayon authored
Result after adding the --break-closing-brackets to astyle Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
Emmanuel Promayon authored
This is the result of running a basic astyle --style=java -R *.cpp *.h Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
Jean-Loup Haberbusch authored
Conflicts: CMakeLists.txt sdk/cmake/modules/macros/camitk/CamiTKExtension.cmake
-
- 22 Jul, 2016 5 commits
-
-
Emmanuel Promayon authored
-
Emmanuel Promayon authored
-
Emmanuel Promayon authored
-
Jean-Loup Haberbusch authored
-
Jean-Loup Haberbusch authored
-
- 21 Jul, 2016 2 commits
-
-
-
Emmanuel Promayon authored
-
- 20 Jul, 2016 6 commits
-
-
Jean-Loup Haberbusch authored
-
Jean-Loup HABERBUSCH authored
-
Jean-Loup HABERBUSCH authored
Reordering includes to avoid problems on Win32 with VTKQWidget2 This hotfix modifies RendererWidget inheritance. Now RendererWidget inherits from VTKQWidget2 instead of VTKQWidget. In VTK 6.3, VTKQWidget2 include somehow somewhere Win32 headers. This defines the ERROR macro, which creates a conflict with the ApplyStatus enum (that also defines ERROR apply status). In order to solve this conflict, #include "Action.h" should be done before any \#include "InteractiveViewer.h" or "RendererWidget.h"
-
Jean-Loup Haberbusch authored
-
Emmanuel Promayon authored
Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-
Emmanuel Promayon authored
There is also some specific OpenGL Format/context forced reinitialization for integrated card (as well as a mean to avoir this reinitialization, using CAMITK_NO_OPENGL_RESET=1 environment variable. Note: use primusrun instead of optirun for GPU/discrete card configuration on Linux (bumblebee) Signed-off-by:
Emmanuel Promayon <Emmanuel.Promayon@imag.fr>
-