Skip to content
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

feature/nsis installer update and new external lib build dir #28

Merged
merged 13 commits into from
Sep 3, 2020

Conversation

jmkerloch
Copy link
Contributor

@jmkerloch jmkerloch commented Aug 20, 2020

  • Update NSIS installer for examples and sources packaging.

  • Use of new github repository to fetch examples.

  • Use of new external library build dir to allow multiple build directory with common external library build dir.

  • Add windows system librairies to NSIS installer

  • Correction of documentation name for NSIS installer

@jmkerloch jmkerloch self-assigned this Aug 20, 2020
src/CMakeLists.txt Outdated Show resolved Hide resolved
@jmkerloch jmkerloch changed the title WIP : Feature/nsis installer update and new external lib build dir feature/nsis installer update and new external lib build dir Sep 2, 2020
@jmkerloch jmkerloch assigned guilpier-code and unassigned jmkerloch Sep 2, 2020
@jmkerloch jmkerloch added the enhancement New feature or request label Sep 2, 2020
@jmkerloch jmkerloch added this to the v7.2 milestone Sep 2, 2020
Copy link
Contributor

@sgatto sgatto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

src/cmake/wxWidgets/FindwxWidgets.cmake Show resolved Hide resolved
src/distrib/CMakeLists.txt Outdated Show resolved Hide resolved
src/CMakeLists.txt Outdated Show resolved Hide resolved
src/cmake/dependencies/CMakeLists.txt Show resolved Hide resolved
@@ -169,8 +169,8 @@ macro(DBG_MSG _MSG)
"${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question : this file is processed by cmake only in case of vcpkg use. Why ? (I don't understand the comment in src/CMakeLists.txt : 227)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is use as a patch for vcpkg because there is currently an issue with find_package(wxWidgets) with vcpkg.
See microsoft/vcpkg#4756
There is a PR waiting for review that will maybe remove the need of this specific .cmake.

@jmkerloch jmkerloch merged commit a5963a8 into develop Sep 3, 2020
@jmkerloch jmkerloch deleted the feature/nsis_installer_update branch September 3, 2020 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants