Skip to content

Cmake/install refactor #5121

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

Closed
Reflexe wants to merge 24 commits into from
Closed

Cmake/install refactor #5121

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e08f1f7
Rewrite CMake dependency installation
lukas-w Jun 13, 2018
c9ec090
Fix listing file names to deploy
lukas-w Jun 16, 2018
9f5f6fe
Fix Windows packaging
PhysSong Nov 25, 2018
76a08e2
InstallDependencies: fix the status message
PhysSong Nov 26, 2018
40b9a35
CircleCI: create Windows installers
PhysSong Nov 26, 2018
c9df21f
AppVeyor: create Windows installers
PhysSong Nov 26, 2018
0bf02f4
Install: fix LIB_DIRS for non-Windows builds
PhysSong Nov 26, 2018
e08d5c9
Update Windows exclude list
PhysSong Nov 26, 2018
e2c9a97
Add SETUPAPI.dll
PhysSong Jul 18, 2019
9b50183
Use per-build-type DEPLOY_LIST_FILE
PhysSong Jul 18, 2019
88e7e86
CMake: extract dll installation code into a portable function.
Reflexe Aug 12, 2019
d937775
CMake -> RemoteVstPlugin32: Enable automatic dll installation.
Reflexe Aug 12, 2019
f2b782f
Merge pull request #3 from LMMS/master
Reflexe Aug 20, 2019
488b19f
Travis test Commit; to be removed
Reflexe Aug 21, 2019
74a278d
Merge branch 'cmake/install-refactor' of github.com:Reflexe/lmms into…
Reflexe Aug 21, 2019
9491d85
(fixup) CMake: Add manpage
Reflexe Aug 21, 2019
61bd86f
fixup! (fixup) CMake: Add manpage
Reflexe Aug 21, 2019
bd703f5
fixup! 9b50183 Use per-build-type DEPLOY_LIST_FILE
Reflexe Aug 21, 2019
4ee6fac
CMake->BuildPlugin: Change PREFIX even if STRIP is false.
Reflexe Aug 21, 2019
93724b6
CMake: Provide API for install-time variables with generator expression.
Reflexe Aug 21, 2019
be9f2a0
CMake: Move InstallTargetDependencies to cmake/modules
Reflexe Aug 21, 2019
d102b57
fixup! CMake: extract dll installation code into a portable function.
Reflexe Aug 22, 2019
66b4908
Temp: an attempt to solve appveyor build.
Reflexe Aug 22, 2019
75bba03
fixup! CMake: Provide API for install-time variables with generator e…
Reflexe Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Install: fix LIB_DIRS for non-Windows builds
  • Loading branch information
@PhysSong
PhysSong committed Jul 17, 2019
commit 0bf02f4e1d42a7cbfc2290eb275de387e2f82088
7 changes: 3 additions & 4 deletions cmake/install/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@ IF(LMMS_BUILD_WIN32 OR LMMS_INSTALL_DEPENDENCIES)
continue()
endif()

if(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE)
list(APPEND LIB_DIRS ${lib_dir})
elseif(lib MATCHES ".(lib|dll.a)$")
get_filename_component(lib_dir ${lib} PATH)
get_filename_component(lib_dir ${lib} PATH)
list(APPEND LIB_DIRS ${lib_dir})
if(lib MATCHES ".(lib|dll.a)$")
if(IS_DIRECTORY ${lib_dir}/../bin)
list(APPEND LIB_DIRS ${lib_dir}/../bin)
endif()
Expand Down