Created
April 29, 2020 06:51
-
-
Save marxin/97ea5bf46f66308be8370a6bf571745c to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/CMakeLists.txt b/CMakeLists.txt | |
index 080a5d6..4843cbf 100644 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -170,7 +170,7 @@ configure_file( | |
) | |
install(PROGRAMS "${PROJECT_BINARY_DIR}/cvise.py" | |
- DESTINATION "bin" | |
+ DESTINATION "${CMAKE_INSTALL_BINDIR}" | |
RENAME "cvise" | |
) | |
diff --git a/clang_delta/CMakeLists.txt b/clang_delta/CMakeLists.txt | |
index e7d70e5..10f9622 100644 | |
--- a/clang_delta/CMakeLists.txt | |
+++ b/clang_delta/CMakeLists.txt | |
@@ -512,24 +512,8 @@ set(CMAKE_CXX_FLAGS_ASAN | |
FORCE) | |
install(TARGETS clang_delta | |
- RUNTIME DESTINATION | |
+ RUNTIME DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/cvise/" | |
) | |
-# If binary is read-only, then installing may fail with an error: | |
-# CMake Error at cmake_install.cmake:45 (FILE): | |
-# file RPATH_REMOVE could not remove RPATH from file: | |
-# /disk2/randtest/install/libexec/clang_delta | |
-# Error opening file for update. | |
-# | |
-# Do I want RPATH at all? We can turn it off, by setting CMAKE_SKIP_RPATH | |
-# https://cmake.org/cmake/help/v2.8.8/cmake.html#variable%3aCMAKE_SKIP_RPATH | |
-# See also the stuff about RPATH for `set_target_properties', which I don't | |
-# really grok: | |
-# https://cmake.org/cmake/help/v2.8.8/cmake.html#command:set_target_properties | |
-# | |
-# PERMISSIONS | |
-# OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE | |
- | |
-##### | |
############################################################################### | |
diff --git a/clex/CMakeLists.txt b/clex/CMakeLists.txt | |
index d805e52..c49de41 100644 | |
--- a/clex/CMakeLists.txt | |
+++ b/clex/CMakeLists.txt | |
@@ -55,7 +55,7 @@ set_source_files_properties(strlex.c PROPERTIES COMPILE_FLAGS -Wno-unused-functi | |
############################################################################### | |
install(TARGETS clex strlex | |
- RUNTIME DESTINATION | |
+ RUNTIME DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/cvise/" | |
) | |
############################################################################### | |
diff --git a/cvise/CMakeLists.txt b/cvise/CMakeLists.txt | |
index 60271d2..6cc0d4d 100644 | |
--- a/cvise/CMakeLists.txt | |
+++ b/cvise/CMakeLists.txt | |
@@ -107,7 +107,7 @@ endforeach() | |
############################################################################### | |
install(DIRECTORY "${cvise_python_BINARY_DIR}/" | |
- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/${cvise_PACKAGE}" | |
+ DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/${cvise_PACKAGE}" | |
FILES_MATCHING | |
PATTERN "*.py" | |
PATTERN "*.json" | |
diff --git a/cvise/cvise.py b/cvise/cvise.py | |
index 46da443..966819d 100644 | |
--- a/cvise/cvise.py | |
+++ b/cvise/cvise.py | |
@@ -13,8 +13,8 @@ from .utils.error import PrerequisitesNotFoundError | |
class CVise: | |
class Info: | |
- BINDIR = '@bindir@' | |
- LIBEXECDIR = '@libexecdir@' | |
+ BINDIR = '@BINDIR@' | |
+ LIBEXECDIR = '@LIBEXECDIR@' | |
PACKAGE_BUGREPORT = "@cvise_PACKAGE_BUGREPORT@" | |
PACKAGE_NAME = "@cvise_PACKAGE_NAME@" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment