Skip to content

Improve cmake osx#3477

Merged
keneanung merged 9 commits intodevelopmentfrom
ImproveCmakeOsx
Mar 17, 2020
Merged

Improve cmake osx#3477
keneanung merged 9 commits intodevelopmentfrom
ImproveCmakeOsx

Conversation

@keneanung
Copy link
Copy Markdown
Member

Brief overview of PR changes/additions

Required changes to allow sparkle-glue to update to latest. This adds our FindSparkle cmake module, which allows for a more modern approach of cmake.

Motivation for adding to Mudlet

Cleaner cmake files.

Other info (issues closed, discussion etc)

#1392 #3024

@keneanung keneanung requested a review from a team March 17, 2020 17:34
@add-deployment-links
Copy link
Copy Markdown

add-deployment-links bot commented Mar 17, 2020

Hey there! Thanks for helping Mudlet improve. 🌟

Test versions

You can directly test the changes here:

No need to install anything - just unzip and run.
Let us know if it works well, and if it doesn't, please give details.

Copy link
Copy Markdown
Member

@vadi2 vadi2 left a comment

Choose a reason for hiding this comment

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

🥇

@keneanung keneanung merged commit 30726e8 into development Mar 17, 2020
@vadi2 vadi2 deleted the ImproveCmakeOsx branch March 17, 2020 18:26
Chris7 pushed a commit to Chris7/Mudlet that referenced this pull request Jan 2, 2022
* Create a bundle on macOS and fix Sparkle linking for cmake

* Make finding sparkle a find module

* More tweaks to root CMakeLists.txt

* Update sparkle-glue submodule to latest

* Create a bundle on macOS and fix Sparkle linking for cmake

* More tweaks to root CMakeLists.txt

* Make finding sparkle a find module

* Update sparkle-glue submodule to latest
SlySven added a commit to SlySven/Mudlet that referenced this pull request Apr 5, 2022
There are files now in Mudlet that seem to have been forgotten from being
added to these variables so they can be seen in Qt Creator, they are:
* OTHER_FILES:
  * ./.devcontainer/Dockerfile (added by Mudlet#4087)
  * ./.devcontainer/devcontainer.json (added by Mudlet#4087)
  * ./.devcontainer/library-scripts/desktop-lite-debian.sh (added by Mudlet#4088)
  * ./.github/workflows/generate-changelog.yml (added by Mudlet#6006)
  * ./CI/appveyor.validate_deployment.ps1 (added by Mudlet#3493)
  * ./CI/generate-changelog.lua (renamed from
      ./CI/generate-ptb-changelog.lua by Mudlet#6002, that file created by Mudlet#3517)
  * ./CI/travis.validate_deployment.sh (added by Mudlet#3493)
  * ./CI/update-autocompletion.lua (added by Mudlet#3452)
  * ./dangerfile.js (added by Mudlet#5489)
  * ./docker/.env.template (added by Mudlet#5047)
* DISTFILES:
  * ./.clang-tidy (added by Mudlet#4858)
  * ./cmake/FindLua51.cmake (added by Mudlet#3167)
  * ./cmake/FindSparkle.cmake (added Mudlet#3477)
  * ./cmake/FindZZIPLIB.cmake (added by Mudlet#3630)
  * ./cmake/IncludeOptionalModule.cmake (added by Mudlet#3174)
  * ./cmake/InitGitSubmodule.cmake (added by Mudlet#3171)

The following files have gone away:
* OTHER_FILES:
  * ./.github/workflows/whitespace-linter.yml (removed by Mudlet#4152)
  * ./.travis.yml (removed by Mudlet#5611)
  * ./README (renamed to ./dev_README by Mudlet#439, removed by Mudlet#1169)

Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
SlySven added a commit that referenced this pull request Apr 5, 2022
…les (#6037)

This PR had three commits:
* The first commit just sorts in a case insensitive manner the files in the
OTHER_FILES and DISTFILES QMake variables. This is a precursor to making
changes to them.
* The second swaps some files between QMake OTHER_FILES and DISTFILES
variables. Technically the latter are for files that are needed to go into
a source tarball that the traditional GNU 'make dist' operation would
produce. As such it does not seem reasonable to include CI/CB control files
in it. Conversely the run-time LUA files that Mudlet needs definitely
should be included and so this commit moves them from the OTHER_FILES
variable, whose contents are merely files that we want to show up in the
Qt Creator IDE so they can be seen, searched and edited from there.
* The third changes the contents of QMake OTHER_FILES and DISTFILES
variables as there are files now in Mudlet that seem to have been forgotten
from being added to these variables so they can be seen in Qt Creator, they
are:
  * OTHER_FILES:
    * ./.devcontainer/Dockerfile (added by Setup Mudlet for C++ Github
                                                           Codespace #4087)
    * ./.devcontainer/devcontainer.json (added by Setup Mudlet for C++
                                                    Github Codespace #4087)
    * ./.devcontainer/library-scripts/desktop-lite-debian.sh (added by Open
                             Mudlet remotely using Github Codespaces #4088)
    * ./.github/workflows/generate-changelog.yml (added by Infrastructure:
                       add workflow to create changelog from the web #6006)
    * ./CI/appveyor.validate_deployment.ps1 (added by Add updater
                    validation to linux/macos/windows release builds #3493)
    * ./CI/generate-changelog.lua (renamed from
        ./CI/generate-ptb-changelog.lua by Infrastucture: update changelog
        generator to handle releases as well #6002, that file created by 
                          Add a changelog generator for PTB releases #3517)
    * ./CI/travis.validate_deployment.sh (added by Add updater validation
                               to linux/macos/windows release builds #3493)
    * ./CI/update-autocompletion.lua (added by Add action for automatic
                                  updates of Mudlet's autocompletion #3452)
    * ./dangerfile.js (added by Infrastructure: danger checks in JS #5489)
    * ./docker/.env.template (added by Docker development support #5047)
  * DISTFILES:
    * ./.clang-tidy (added by Add automated check to verify improvements
                                    against Mudlet's C++ style guide #4858)
    * ./cmake/FindLua51.cmake (added by Modernize cmake files (part 1)
                                                                     #3167)
    * ./cmake/FindSparkle.cmake (added Improve cmake osx #3477)
    * ./cmake/FindZZIPLIB.cmake (added by Build Mudlet for macOS with
                                                      Github Actions #3630)
    * ./cmake/IncludeOptionalModule.cmake (added by Cmake improve optional
                                                        module check #3174)
    * ./cmake/InitGitSubmodule.cmake (added by Cmake improve git submodule
                                                      initialization #3171)

Also, the following files have gone away:
  * OTHER_FILES:
    * ./.github/workflows/whitespace-linter.yml (removed by Delete
                                            whitespace-linter action #4152)
    * ./.travis.yml (removed by Infrastructure: delete .travis.yml #5611)
    * ./README (renamed to ./dev_README by Release 3.0 merge into master
                #439, removed by Merge 3.3.0 development into master #1169)

Signed-off-by: Stephen Lyons slysven@virginmedia.com
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants