diff --git a/README.md b/README.md index 96d6785..b2aff3f 100644 --- a/README.md +++ b/README.md @@ -86,12 +86,10 @@ cd pvpgn-server && CC=/usr/bin/clang CXX=/usr/bin/clang++ ../cmake-3.7.1-Linux-x cd build && make ``` -#### Centos 7 +#### CentOS 7 ``` -sudo yum -y install yum-utils epel-release git -sudo yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/kdesig/cmake3_EPEL/repo/epel-7/group_kdesig-cmake3_EPEL-epel-7.repo -sudo yum -y install cmake3 centos-release-scl zlib-devel -sudo yum install devtoolset-4-gcc* +sudo yum -y install epel-release centos-release-scl +sudo yum -y install git zlib-devel cmake3 devtoolset-4-gcc* sudo ln -s /usr/bin/cmake3 /usr/bin/cmake git clone https://github.com/pvpgn/pvpgn-server.git cd pvpgn-server diff --git a/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake index ef7a4b9..aac2bf1 100644 --- a/cmake/Modules/DefineInstallationPaths.cmake +++ b/cmake/Modules/DefineInstallationPaths.cmake @@ -9,6 +9,12 @@ SET(EXEC_INSTALL_PREFIX FORCE ) +SET(SHARE_INSTALL_PREFIX + "${CMAKE_INSTALL_PREFIX}/share" + CACHE PATH "Base directory for files which go to share/" + FORCE +) + SET(DATA_INSTALL_PREFIX "${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}" CACHE PATH "The parent directory where applications can install their data" @@ -57,12 +63,6 @@ else() ) endif() -SET(SHARE_INSTALL_PREFIX - "${CMAKE_INSTALL_PREFIX}/share" - CACHE PATH "Base directory for files which go to share/" - FORCE -) - if(WIN32) SET(SYSCONF_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/conf"