From 4c1136ee6c08eb9fef86ebaafe2544692472b5b7 Mon Sep 17 00:00:00 2001 From: FUJI Goro Date: Wed, 18 Mar 2020 14:26:43 +0900 Subject: [PATCH] Make -DCMAKE_INSTALL_PREFIX=/usr as the default (#2800) * make -DCMAKE_INSTALL_PREFIX=/usr as the default * remove -DCMAKE_INSTALL_PEREFIX=/usr from INSTALL.md as it gets the default --- CMakeLists.txt | 4 ++++ INSTALL.md | 15 +++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1916b55caa8..ad0070548d87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,10 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "path to install" FORCE) +endif() + enable_testing() # populate submodules (libbpf) diff --git a/INSTALL.md b/INSTALL.md index fbbab742d184..dc9e4d2cac36 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -356,7 +356,7 @@ sudo apt-get -y install luajit luajit-5.1-dev ``` git clone https://github.com/iovisor/bcc.git mkdir bcc/build; cd bcc/build -cmake .. -DCMAKE_INSTALL_PREFIX=/usr +cmake .. make sudo make install cmake -DPYTHON_CMD=python3 .. # build python3 binding @@ -399,7 +399,7 @@ sudo dnf install -y clang clang-devel llvm llvm-devel llvm-static ncurses-devel ``` git clone https://github.com/iovisor/bcc.git mkdir bcc/build; cd bcc/build -cmake .. -DCMAKE_INSTALL_PREFIX=/usr +cmake .. make sudo make install ``` @@ -420,8 +420,7 @@ sudo zypper in lua51-luajit-devel # for lua support in openSUSE Tumbleweed ``` git clone https://github.com/iovisor/bcc.git mkdir bcc/build; cd bcc/build -cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DLUAJIT_INCLUDE_DIR=`pkg-config --variable=includedir luajit` \ # for lua support +cmake -DLUAJIT_INCLUDE_DIR=`pkg-config --variable=includedir luajit` \ # for lua support .. make sudo make install @@ -461,13 +460,13 @@ mkdir llvm-build cd llvm-build cmake3 -G "Unix Makefiles" -DLLVM_TARGETS_TO_BUILD="BPF;X86" \ - -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../llvm-7.0.1.src + -DCMAKE_BUILD_TYPE=Release ../llvm-7.0.1.src make sudo make install cd ../clang-build cmake3 -G "Unix Makefiles" -DLLVM_TARGETS_TO_BUILD="BPF;X86" \ - -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../cfe-7.0.1.src + -DCMAKE_BUILD_TYPE=Release ../cfe-7.0.1.src make sudo make install cd .. @@ -489,7 +488,7 @@ For permanently enable scl environment, please check https://access.redhat.com/s ``` git clone https://github.com/iovisor/bcc.git mkdir bcc/build; cd bcc/build -cmake .. -DCMAKE_INSTALL_PREFIX=/usr +cmake .. make sudo make install ``` @@ -522,7 +521,7 @@ tar xf clang* git clone https://github.com/iovisor/bcc.git pushd . mkdir bcc/build; cd bcc/build -cmake3 .. -DCMAKE_INSTALL_PREFIX=/usr +cmake3 .. time make sudo make install popd