diff options
| author | Adam <Adam@anope.org> | 2017-04-06 16:32:36 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2017-04-06 16:32:36 -0400 |
| commit | da5e8a03aa8ae8077feab05fe76e6b092f1c8df1 (patch) | |
| tree | 93cd334c886893208ea10315f71756b7bfe7cded /CMakeLists.txt | |
| parent | 2f5eae1633cfa691ea461bf74c0c85506676d1e1 (diff) | |
| parent | c736ba71a5fb6eb51d1e63e00a1ca623c12e0504 (diff) | |
Merge remote-tracking branch 'github/master'
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 477d54e55..ff9a89fb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,8 @@ # This usage of CMake requires at least version 3.0 cmake_minimum_required(VERSION 3.0 FATAL_ERROR) -cmake_policy(SET CMP0003 NEW) -if(POLICY CMP0026) - cmake_policy(SET CMP0026 OLD) -endif() -if(POLICY CMP0007) - cmake_policy(SET CMP0007 OLD) -endif() +cmake_policy(SET CMP0007 OLD) +cmake_policy(SET CMP0026 OLD) # Set the project as C++ primarily, but have C enabled for the checks required later project(Anope CXX) @@ -73,7 +68,7 @@ include_directories(${Anope_BINARY_DIR}/include ${Anope_SOURCE_DIR}/include) # Pass on REPRODUCIBLE_BUILD if(REPRODUCIBLE_BUILD) add_definitions(-DREPRODUCIBLE_BUILD) -endif(REPRODUCIBLE_BUILD) +endif() # If using Windows, always add the _WIN32 define if(WIN32) @@ -116,13 +111,6 @@ endif() # If we are not using Visual Studio, we'll run the following checks if(NOT MSVC) - # Check if the C++ compiler can accept the -pipe flag, and add it to the compile flags if it works - check_cxx_compiler_flag(-pipe HAVE_PIPE_FLAG) - # If the flag was accepted, add it to the list of flags - if(HAVE_PIPE_FLAG) - set(CXXFLAGS "${CXXFLAGS} -pipe") - endif() - # The following are additional library checks, they are not required for Windows if(NOT WIN32) # Check if socket is within the socket library (if the library exists), and add it to the linker flags if needed @@ -289,7 +277,7 @@ install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DB_ install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${LOGS_DIR}\")") if(WIN32) install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/runtime\")") -endif(WIN32) +endif() # On non-Windows platforms, if RUNGROUP is set, change the permissions of the below directories, as well as the group of the data directory if(NOT WIN32 AND RUNGROUP) install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${DB_DIR}/backups\")") |