Cmake/install refactor #5121

Reflexe · 2019-08-12T09:37:57Z

No description provided.

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".

Also enables deploying dependencies for RemoteZynAddSubFX.

* Add missing entries into the Windows exclude list * Respect the case insensitivity of Windows * Fix incorrect `lib` prefix for plugins on Windows

For some reason `MESSAGE(STATUS)` doesn't work on install time.

Fixes MSVC build error

Master

Reflexe · 2019-08-20T16:35:27Z

I don't get it; for some strange reason cmake tries to write each filelists.txt 9 times with appveyor.
https://ci.appveyor.com/project/Lukas-W/lmms/builds/26826636/job/5rob3k12jdr07f83

maybe we add_subdirectory 9 times somehow?

Ok, according to sakra/cotire#120 it probably has something to do with those generator expressions.

We could try to install the artifact into a temporary directory or just install the artifact and remove other installations.

cmake/install/InstallTargetDependencies.cmake

src/CMakeLists.txt

PhysSong · 2019-08-21T04:06:25Z

cmake/install/CMakeLists.txt

-				if(IS_DIRECTORY ${lib_dir}/bin)
-					list(APPEND LIB_DIRS ${lib_dir}/bin)
-				endif()
-			endif()


This trick(adding ../bin and ./bin) should be moved to cmake/install/InstallTargetDependencies.cmake, after line 32. It was here to support non-standard locations, ex. libwinpthread-1.dll in Travis-CI builds.

I tried to solve that with the SUFFIXES argument. However, I don't know why it doesn't work.

Have you tried adding ../bin to the SUFFIXES argument?

… cmake/install-refactor

Apply suffixes to implicit link directories and add ../bin

PhysSong · 2019-08-22T08:47:16Z

cmake/modules/DefineInstallVar.cmake

+    if(VAR_GENERATOR_EXPRESSION AND ${CMAKE_VERSION} VERSION_LESS "3.14.0")
+        include(CreateTempFilePath)
+        CreateTempFilePath(OUTPUT_VAR file_path)
+        file(GENERATE OUTPUT "${file_path}" CONTENT "${VAR_CONTENT}")


The counter logic doesn't work because the CMake script is evaluated only once. For the MSVC generator, file(GENERATE) itself is executed once, but the content is evaluated multiple times at the generation time.

NVM, I misunderstood the purpose of it.

However, I still wonder: Can we create files with unique names(more readable if possible) without a counter?

PhysSong · 2019-08-22T10:18:14Z

cmake/modules/DefineInstallVar.cmake

    cmake_parse_arguments(VAR "${options}" "${oneValueArgs}"
            "${multiValueArgs}" ${ARGN} )

    # install(CODE) does not support generator expression in ver<3.14


On a side note, CMP0087 should be set to use generator expressions in CMake >= 3.14.

PhysSong · 2019-08-22T10:27:01Z

Regarding the MSVC failure: I debugged the generation logic and got values from different configurations.
RemoteVstPlugin:

C:/projects/lmms/build/plugins/32/RemoteVstPlugin32.exe
C:/projects/lmms/build/plugins/32/RemoteVstPlugin32.exe
C:/projects/lmms/build/plugins/32/RemoteVstPlugin32.exe
C:/projects/lmms/build/plugins/32/RemoteVstPlugin32.exe

LMMS binary:

C:/projects/lmms/build/Debug/lmms.exe
C:/projects/lmms/build/MinSizeRel/lmms.exe
C:/projects/lmms/build/Release/lmms.exe
C:/projects/lmms/build/RelWithDebInfo/lmms.exe

Other plugins:

C:/projects/lmms/build/plugins/Debug/audiofileprocessor.dll;(omitted)
C:/projects/lmms/build/plugins/MinSizeRel/audiofileprocessor.dll;(omitted)
C:/projects/lmms/build/plugins/Release/audiofileprocessor.dll;(omitted)
C:/projects/lmms/build/plugins/RelWithDebInfo/audiofileprocessor.dll;(omitted)

I think we can generate with $<CONFIG> and read with ${CMAKE_BUILD_TYPE} when using multi-config generators like the MSVC generator.

…xpression.

PhysSong · 2019-08-22T11:04:54Z

cmake/modules/DefineInstallVar.cmake

+        file(GENERATE OUTPUT "${file_path}" CONTENT "${VAR_CONTENT}")
+        install(CODE "file(READ ${file_path} \"${VAR_NAME}\")")
+    else()
+        cmake_policy(SET CMP<0087> NEW)


Suggested change

cmake_policy(SET CMP<0087> NEW)

cmake_policy(SET CMP0087 NEW)

Also, why did you use spaces instead of tabs in some new files?

PhysSong · 2019-08-22T13:02:30Z

Due to the GitHub outage, this PR is moved to #5142.

lukas-w and others added 10 commits July 18, 2019 08:45

Fix listing file names to deploy

c9ec090

Also enables deploying dependencies for RemoteZynAddSubFX.

Fix Windows packaging

9f5f6fe

* Add missing entries into the Windows exclude list * Respect the case insensitivity of Windows * Fix incorrect `lib` prefix for plugins on Windows

InstallDependencies: fix the status message

76a08e2

For some reason `MESSAGE(STATUS)` doesn't work on install time.

CircleCI: create Windows installers

40b9a35

AppVeyor: create Windows installers

c9df21f

Install: fix LIB_DIRS for non-Windows builds

0bf02f4

Update Windows exclude list

e08d5c9

Add SETUPAPI.dll

e2c9a97

Use per-build-type DEPLOY_LIST_FILE

9b50183

Fixes MSVC build error

Reflexe added the in progress label Aug 12, 2019

Reflexe self-assigned this Aug 12, 2019

Reflexe force-pushed the cmake/install-refactor branch from c2f2c9e to 6e1d2ff Compare August 12, 2019 16:08

Reflexe added 2 commits August 12, 2019 19:17

CMake: extract dll installation code into a portable function.

88e7e86

CMake -> RemoteVstPlugin32: Enable automatic dll installation.

d937775

Reflexe force-pushed the cmake/install-refactor branch from 6e1d2ff to d937775 Compare August 12, 2019 16:18

PhysSong self-requested a review August 13, 2019 07:43

Merge pull request #3 from LMMS/master

f2b782f

Master

PhysSong reviewed Aug 21, 2019

View reviewed changes

cmake/install/InstallTargetDependencies.cmake Outdated Show resolved Hide resolved

PhysSong reviewed Aug 21, 2019

View reviewed changes

src/CMakeLists.txt Show resolved Hide resolved

PhysSong reviewed Aug 21, 2019

View reviewed changes

Reflexe added 8 commits August 21, 2019 20:52

Travis test Commit; to be removed

488b19f

Merge branch 'cmake/install-refactor' of github.com:Reflexe/lmms into…

74a278d

… cmake/install-refactor

(fixup) CMake: Add manpage

9491d85

fixup! (fixup) CMake: Add manpage

61bd86f

fixup! 9b50183 Use per-build-type DEPLOY_LIST_FILE

bd703f5

CMake->BuildPlugin: Change PREFIX even if STRIP is false.

4ee6fac

CMake: Provide API for install-time variables with generator expression.

93724b6

CMake: Move InstallTargetDependencies to cmake/modules

be9f2a0

Reflexe added 2 commits August 22, 2019 08:24

fixup! CMake: extract dll installation code into a portable function.

d102b57

Apply suffixes to implicit link directories and add ../bin

Temp: an attempt to solve appveyor build.

66b4908

PhysSong reviewed Aug 22, 2019

View reviewed changes

fixup! CMake: Provide API for install-time variables with generator e…

75bba03

…xpression.

PhysSong reviewed Aug 22, 2019

View reviewed changes

Reflexe closed this Aug 22, 2019

	cmake_policy(SET CMP<0087> NEW)
	cmake_policy(SET CMP0087 NEW)

Uh oh!

Cmake/install refactor #5121

Cmake/install refactor #5121

Uh oh!

Conversation

Reflexe commented Aug 12, 2019

Uh oh!

Reflexe commented Aug 20, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PhysSong Aug 21, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reflexe Aug 21, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

PhysSong Aug 21, 2019

Choose a reason for hiding this comment

Uh oh!

PhysSong Aug 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

PhysSong Aug 22, 2019

Choose a reason for hiding this comment

Uh oh!

PhysSong Aug 22, 2019

Choose a reason for hiding this comment

Uh oh!

PhysSong Aug 22, 2019

Choose a reason for hiding this comment

Uh oh!

PhysSong commented Aug 22, 2019

Uh oh!

PhysSong Aug 22, 2019

Choose a reason for hiding this comment

Uh oh!

PhysSong commented Aug 22, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Reflexe commented Aug 20, 2019 •

edited

Loading

PhysSong Aug 21, 2019 •

edited

Loading

Reflexe Aug 21, 2019 •

edited

Loading

PhysSong Aug 22, 2019 •

edited

Loading