diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-08-14 19:39:05 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-08-14 19:39:05 +0200 |
| commit | f2236891202f70b3b964b851ba98890fd7ca7a91 (patch) | |
| tree | 7ee222358da431874f98992ba62d24d1b964789e /cmake | |
| parent | 40e1fdd1331f93f2e69c01f3acf901fead48f143 (diff) | |
cmake: drop executable bit from installed normal files
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/opentrack-boilerplate.cmake | 10 | ||||
| -rw-r--r-- | cmake/opentrack-install.cmake | 17 |
2 files changed, 15 insertions, 12 deletions
diff --git a/cmake/opentrack-boilerplate.cmake b/cmake/opentrack-boilerplate.cmake index 555e686d..70ded904 100644 --- a/cmake/opentrack-boilerplate.cmake +++ b/cmake/opentrack-boilerplate.cmake @@ -1,4 +1,6 @@ -set(opentrack-perms PERMISSIONS WORLD_READ WORLD_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE) +set(opentrack-perms-file WORLD_READ OWNER_WRITE OWNER_READ GROUP_READ) +set(opentrack-perms-dir WORLD_READ WORLD_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE) +set(opentrack-perms-exec "${opentrack-perms-dir}") set(new-hier-path "#pragma once #ifndef OPENTRACK_NO_QT_PATH @@ -104,7 +106,7 @@ include(CMakeParseArguments) function(otr_install_pdb_current_project target) if(MSVC) - install(FILES "$<TARGET_PDB_FILE:${target}>" DESTINATION "${opentrack-hier-debug}" ${opentrack-perms}) + install(FILES "$<TARGET_PDB_FILE:${target}>" DESTINATION "${opentrack-hier-debug}" PERMISSIONS ${opentrack-perms-file}) endif() endfunction() @@ -197,9 +199,9 @@ function(otr_module n_) if(NOT arg_NO-INSTALL) if(arg_BIN AND WIN32) - install(TARGETS "${n}" RUNTIME DESTINATION . ${opentrack-perms}) + install(TARGETS "${n}" RUNTIME DESTINATION . PERMISSIONS ${opentrack-perms-exec}) else() - install(TARGETS "${n}" ${opentrack-hier-str} ${opentrack-perms}) + install(TARGETS "${n}" ${opentrack-hier-str} PERMISSIONS ${opentrack-perms-exec}) endif() set(opentrack_install-debug-info FALSE CACHE BOOL "Whether to build and install debug info at install time") if(opentrack_install-debug-info) diff --git a/cmake/opentrack-install.cmake b/cmake/opentrack-install.cmake index 46649820..62de340d 100644 --- a/cmake/opentrack-install.cmake +++ b/cmake/opentrack-install.cmake @@ -1,15 +1,16 @@ -set(opentrack-perms_ WORLD_READ WORLD_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE) -set(opentrack-perms PERMISSIONS ${opentrack-perms_}) - macro(otr_inst2 path) - install(${ARGN} DESTINATION "${path}" ${opentrack-perms}) + install(${ARGN} DESTINATION "${path}" PERMISSIONS ${opentrack-perms-file}) +endmacro() + +macro(otr_inst_exec path) + install(${ARGN} DESTINATION "${path}" PERMISSIONS ${opentrack-perms-file}) endmacro() macro(otr_inst_dir path) install( DIRECTORY ${ARGN} DESTINATION "${path}" - FILE_PERMISSIONS ${opentrack-perms_} - DIRECTORY_PERMISSIONS ${opentrack-perms_} + FILE_PERMISSIONS ${opentrack-perms-file} + DIRECTORY_PERMISSIONS ${opentrack-perms-dir} ) endmacro() @@ -34,8 +35,8 @@ endif() otr_inst2("${opentrack-doc-pfx}" FILES ${CMAKE_SOURCE_DIR}/README.md) -otr_inst2("${opentrack-hier-pfx}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient.dll") -otr_inst2("${opentrack-hier-pfx}" FILES +otr_inst_exec("${opentrack-hier-pfx}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient.dll") +otr_inst_exec("${opentrack-hier-pfx}" FILES "${CMAKE_SOURCE_DIR}/bin/NPClient.dll" "${CMAKE_SOURCE_DIR}/bin/NPClient64.dll" "${CMAKE_SOURCE_DIR}/bin/TrackIR.exe") |