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.

Sign up for GitHub

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

Jump to bottom

Cmake/install refactor #5142

Merged
merged 9 commits into from Sep 24, 2019
Merged

Cmake/install refactor #5142

merged 9 commits into from Sep 24, 2019

Conversation

Reflexe
Copy link
Member

@Reflexe Reflexe commented Aug 22, 2019

No description provided.

@PhysSong PhysSong mentioned this pull request Aug 22, 2019
Closed
@Reflexe Reflexe force-pushed the cmake/install-refactor branch 2 times, most recently from c73bb17 to e32de9f Compare August 22, 2019 19:48
PhysSong
PhysSong reviewed Aug 22, 2019
View reviewed changes
plugins/vst_base/RemoteVstPlugin32.cmake Outdated
ExternalProject_Get_Property(${name} BINARY_DIR)

install(CODE
"execute_process(COMMAND ${CMAKE_COMMAND} \"-DCMAKE_INSTALL_PREFIX=\${CMAKE_INSTALL_PREFIX}\" -P cmake_install.cmake
Copy link
Member

@PhysSong PhysSong Aug 22, 2019 •
edited

Choose a reason for hiding this comment

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

According to the CMake documentation, it seems like we should pass COMPONENT and BUILD_TYPE as well.

Copy link
Member Author

Choose a reason for hiding this comment

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

it seems to have a syntax problem. I don't know why.

Copy link
Member

Choose a reason for hiding this comment

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

It seems like we can just include the target's cmake_install.cmake as well.

@PhysSong
Copy link
Member

@Reflexe Is it okay for you if I add some commits here?

@Reflexe
Copy link
Member Author

Reflexe commented Aug 23, 2019

@Reflexe Is it okay for you if I add some commits here?

of course.

@Reflexe
Copy link
Member Author

Reflexe commented Aug 23, 2019

Currently we have two problems (apart from THE problem with the file generation).

  1. on 32bit, we can't find Qt dlls.
  2. on 64bit, there is a syntax warning on our hack and it won't run.

@PhysSong
Copy link
Member

I'm working on those issues and made some progress. I will try to finish that tomorrow.

@PhysSong PhysSong mentioned this pull request Aug 29, 2019
Closed
lukas-w and others added 4 commits August 31, 2019 09:09
@lukas-w @PhysSong
Rewrite CMake dependency installation
4fd8e08 
Replaces the hard-coded library paths by a method based on CMake's
GetPrerequisites module which recursively finds a binary file's linked
libraries. Advantage: Potentially works on any system without adaption as
long as CMake supports it, so it could be used to create portable Linux
packages as well. Disadvantage: "Potentially".

Co-Authored-By: Hyunjin Song <tteu.ingog@gmail.com>
@PhysSong
CircleCI: create Windows installers
8d169fa
@PhysSong
AppVeyor: create Windows installers
7a23ee8
@Reflexe @PhysSong
CMake: Provide API for install-time variables with generator expression
72bdb23
@PhysSong
Copy link
Member

I rebased commits a bit, and fixed remaining issues. You can find the commits in https://github.com/PhysSong/lmms/commits/cmake/install-refactor. @Reflexe Is it okay for you if I force-push here?

@Reflexe
Copy link
Member Author

Reflexe commented Aug 31, 2019 •
edited

@Reflexe Is it okay for you if I force-push here?

did that already.

@Reflexe Reflexe force-pushed the cmake/install-refactor branch 2 times, most recently from 7e6b422 to 8897838 Compare September 1, 2019 10:13
@PhysSong
Copy link
Member

PhysSong commented Sep 3, 2019

I can probably add minor changes here for concreteness. After testing them out, we can hopefully merge this one.

@Reflexe
Copy link
Member Author

Reflexe commented Sep 4, 2019 •
edited

just force-pushed a fix for an embarrassing spelling mistake :D
Also, added doc and default search directories and suffixes and now it looks much cleaner.

@Reflexe
Copy link
Member Author

Reflexe commented Sep 23, 2019

Can we merge this?

@PhysSong
Copy link
Member

@Reflexe I forgot to ask your opinion on #5142 (comment). Also, it seems like we don't need to pass LMMS_BUILD_WIN64 to the external project.
Anyway, Other parts looks fine to me.

@Reflexe Reflexe merged commit 57a486c into LMMS:master Sep 24, 2019
@PhysSong PhysSong mentioned this pull request Sep 24, 2019
Closed
PhysSong added a commit that referenced this pull request Oct 9, 2019
@PhysSong
Add back '-Wl,-E' removed in #5142
48de5f1 
Fixes #5221.
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
@Reflexe
Merge pull request LMMS#5142 from Reflexe/cmake/install-refactor
68af3c1 
Support automatic dll collection and refactor cmake installation process.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PhysSong PhysSong Awaiting requested review from PhysSong

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Reflexe @PhysSong @lukas-w