New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CMake] Improve SOFA installation and packaging #635

Merged
merged 90 commits into from Jun 27, 2018

Conversation

@guparan
Copy link
Member

guparan commented Apr 11, 2018

This PR contains all the changes I did to produce SOFA releases.
Basically it is almost only CMake improvements to ease SOFA installation.

Some of them may not be clean/wanted/useful, please give feedback.

WARNING: I renamed some macros in SofaMacros.cmake so this could break your code.


This PR:

  • builds with SUCCESS for all platforms on the CI.
  • does not generate new warnings.
  • does not generate new unit test failures.
  • does not generate new scene test failures.
  • does not break API compatibility.
  • is more than 1 week old (or has fast-merge label).

Reviewers will merge only if all these checks are true.

htalbot and others added some commits Jan 26, 2017

[CMake] FIX SOFA install mishandling of glut dependency and libpng
The flag SOFA_HAVE_GLUT_GUI is replaced by SOFAGUI_GLUT
Only the SOFAGUI requires glut.
IF glut found does not mean to add it as a dependency.

Libpng is also now well shipped for Linux.
[CPack] ADD packing rules
- COMPONENT param in INSTALL rules
- NSIS rules to generate a Windows installer
[CMake] FIX symlinks copy for libs + RENAME macros
sofa_install_get_libraries -> sofa_install_files_from_library
sofa_copy_extlib -> sofa_copy_files_from_target
sofa_install_extlib -> sofa_install_files_from_target
[CMake] EDIT: no more Qt libs install for Unix
User will handle Qt himself by installing
qt5-default, qttools5-dev-tools, libqt5opengl5-dev
[CMake] REMOVE Boost autodetect
This function leads to misunderstand which Boost is being used.
The only variable to set in CMake to locate Boost is BOOST_LIBRARYDIR
Merge remote-tracking branch 'upstream/master' into cmake_cpack_rules
# Conflicts:
#	SofaKernel/SofaFramework/CMakeLists.txt
Merge remote-tracking branch 'sofa-framework/master' into cmake_cpack…
…_rules

# Conflicts:
#	CMakeLists.txt
#	SofaKernel/SofaFramework/CMakeLists.txt
#	SofaKernel/framework/sofa/simulation/CMakeLists.txt

@guparan guparan removed the status: wip label May 24, 2018

Merge remote-tracking branch 'sofa-framework/master' into cmake_cpack…
…_rules

# Conflicts:
#	SofaKernel/SofaFramework/SofaMacros.cmake
@guparan

This comment has been minimized.

Copy link
Member

guparan commented May 28, 2018

[ci-build][with-scene-tests]

else()
message("OpenGL advanced functions (e.g shaders, FBO) are disabled.")
endif()
set(SOFA_HAVE_GLEW ${GLEW_FOUND})

## GLUT
find_package(GLUT)
if(GLUT_FOUND)
if(GLUT_FOUND AND SOFAGUI_GLUT)
if(NOT APPLE)

This comment has been minimized.

@guparan

guparan Jun 5, 2018

Member

@fredroy You did not remove this block in #598
Should I ?

This comment has been minimized.

@guparan

guparan added some commits Jun 5, 2018

guparan and others added some commits Jun 8, 2018

Merge remote-tracking branch 'sofa-framework/master' into cmake_cpack…
…_rules

# Conflicts:
#	SofaGui/CMakeLists.txt
#	applications/sofa/gui/headlessRecorder/HeadlessRecorder.cpp
@guparan

This comment has been minimized.

Copy link
Member

guparan commented Jun 15, 2018

[ci-build][with-scene-tests]

guparan added some commits Jun 15, 2018

Merge remote-tracking branch 'vmagno/fix_install_files' into cmake_cp…
…ack_rules

# Conflicts:
#	applications/packages/SofaAllCommonComponents/CMakeLists.txt
#	applications/projects/runSofa/CMakeLists.txt
#	applications/sofa/gui/qt/CMakeLists.txt
@fredroy
Copy link
Contributor

fredroy left a comment

If everything compiles... I approve 👍

@guparan guparan merged commit 967fe17 into sofa-framework:master Jun 27, 2018

6 of 7 checks passed

Jk2/Scene tests Missing. Use [ci-build][with-scene-tests] to trigger.
Details
Jk2/Dashboard Builds triggered.
Details
Jk2/centos_clang-3.4_options Build OK. FIXME: 0 unit tests
Details
Jk2/mac_clang-3.5_options Build OK. FIXME: 0 unit tests
Details
Jk2/ubuntu_clang-3.8_options Build OK. FIXME: 0 unit tests
Details
Jk2/ubuntu_gcc-5.4_options Build OK. FIXME: 0 unit tests
Details
Jk2/windows7_VS-2015_options_amd64 Build OK. FIXME: 1 unit tests
Details

@guparan guparan added this to the v18.06 milestone Jul 12, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment