dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

NOISSUE rearrange build system

Browse source 
* Added install commands to the libraries instead of force installing files
* Most of the application cmake stuff moved to top level
* RPATH should now be set/cleared correctly
* Contains a fix for GH-1780
This commit is contained in:
Petr Mrázek 2018-01-22 04:28:07 +01:00
parent 0c2e2094ee
commit 166e5a03d6
15 changed files with 276 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmake/BundleUtilities.cmake
View file

@ -301,7 +301,7 @@ function(get_bundle_and_executable app bundle_var executable_var valid_var)
endif()
endif()
else()
message(STATUS "warning: *NOT* handled - directory/file does not exist...")
message(STATUS "warning: *NOT* handled - directory/file ${app} does not exist...")
endif()
if(NOT valid)

7
cmake/GetPrerequisites.cmake
View file

@ -205,6 +205,13 @@ function(is_file_executable file result_var)
return()
endif()
# "file" version 5.22 does not print "(used shared libraries)"
# but uses "interpreter"
if("${file_ov}" MATCHES "shared object.*interpreter")
set(${result_var} 1 PARENT_SCOPE)
return()
endif()
else()
message(STATUS "warning: No 'file' command, skipping execute_process...")
endif()