diff options
| author | Peter Powell <petpow@saberuk.com> | 2017-02-12 22:06:18 +0000 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2017-02-12 22:06:18 +0000 |
| commit | 2de964ffa42221d5d1ad73643dfc46f6fe318021 (patch) | |
| tree | 5befeec9873821c11067f7ec7dfe9d8b0cc2857b | |
| parent | 6699c0454f80350a7671ef366946a94dec556da3 (diff) | |
Clean up conditionals merged from the 2.0 branch.
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/FindSqlite.cmake | 2 | ||||
| -rw-r--r-- | modules/CMakeLists.txt | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index af2dd4d43..ff9a89fb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,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) @@ -277,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\")") diff --git a/cmake/FindSqlite.cmake b/cmake/FindSqlite.cmake index 1bd862551..9ddab533e 100644 --- a/cmake/FindSqlite.cmake +++ b/cmake/FindSqlite.cmake @@ -44,7 +44,7 @@ if( NOT WIN32 ) pkg_check_modules(PC_SQLITE sqlite3) set(SQLITE_DEFINITIONS ${PC_SQLITE_CFLAGS_OTHER}) -endif( NOT WIN32 ) +endif() FIND_PATH(SQLITE_INCLUDE_DIR NAMES sqlite3.h PATHS diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 4a2781caa..0422be7f7 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -15,7 +15,7 @@ macro(build_modules SRC) string(REGEX MATCH "\\.c$" ANOPE18MODULE ${MODULE_SRC}) if(ANOPE18MODULE) message(FATAL_ERROR "Anope 1 modules are not compatible with Anope 2!\nOffending module: ${MODULE_SRC}") - endif(ANOPE18MODULE) + endif() string(REGEX MATCH "\\.cpp$" CPP ${MODULE_SRC}) if(CPP) set_source_files_properties(${MODULE_SRC} PROPERTIES LANGUAGE CXX COMPILE_FLAGS "${CXXFLAGS}") @@ -155,7 +155,7 @@ macro(build_subdir) if(APPLE) # Mark undefined symbols as having to be looked up at runtime set(MOD_EXTRA_LDFLAGS "-undefined dynamic_lookup") - endif(APPLE) + endif() # Generate the module and set its linker flags, also set it to depend on the main Anope executable to be built beforehand add_library(${SO} SHARED ${MODULES_SUBDIR_SRCS}) |