diff options
| author | Sadie Powell <sadie@witchery.services> | 2021-04-27 18:29:45 +0100 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2021-04-27 19:20:36 +0100 |
| commit | c21f6eb5a3e27bf9a661e3fd97f49c85f00f6615 (patch) | |
| tree | 8f5c6cd9e5a6786c2b2cc33d3a008c091e32926d /modules | |
| parent | e2aeab970bcbd94ea3531b345d2ec4df111f0d60 (diff) | |
Rip out compatibility code for now-unsupported CMake versions.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | modules/third/language/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 200569e2d..6dbd0d4a1 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -29,7 +29,7 @@ macro(build_modules SRC) calculate_depends(${MODULE_SRC} TEMP_INCLUDES) # If there were some extra include directories, add them to the list if(TEMP_INCLUDES) - append_to_list(EXTRA_INCLUDES ${TEMP_INCLUDES}) + list(APPEND EXTRA_INCLUDES ${TEMP_INCLUDES}) endif() # Reset linker flags @@ -84,7 +84,7 @@ endmacro() macro(build_subdir) file(GLOB_RECURSE MODULES_SUBDIR_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp") - sort_list(MODULES_SUBDIR_SRCS) + list(SORT MODULES_SUBDIR_SRCS) GET_FILENAME_COMPONENT(FOLDER_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME) set(SO "${FOLDER_NAME}.so") @@ -117,7 +117,7 @@ macro(build_subdir) # Append this source file's linker flags to the subdirectoy's linker flags, if there are any to append if(TEMP_DEPENDENCIES) - append_to_list(SUBDIR_EXTRA_DEPENDS ${TEMP_DEPDENCIES}) + list(APPEND SUBDIR_EXTRA_DEPENDS ${TEMP_DEPDENCIES}) endif() endif() endforeach() @@ -126,12 +126,12 @@ macro(build_subdir) if(HAS_FUNCTION) # Remove duplicates from the linker flags if(SUBDIR_LDFLAGS) - remove_list_duplicates(SUBDIR_LDFLAGS) + list(REMOVE_DUPLICATES SUBDIR_LDFLAGS) endif() # Remove duplicates from the extra dependencies if(SUBDIR_EXTRA_DEPENDS) - remove_list_duplicates(SUBDIR_EXTRA_DEPENDS) + list(REMOVE_DUPLICATES SUBDIR_EXTRA_DEPENDS) endif() # For Visual Studio only, include win32_memory static library, required to override Visual Studio's overrides of the new/delete operators diff --git a/modules/third/language/CMakeLists.txt b/modules/third/language/CMakeLists.txt index ce636b539..835b4ee4f 100644 --- a/modules/third/language/CMakeLists.txt +++ b/modules/third/language/CMakeLists.txt @@ -2,7 +2,7 @@ if(GETTEXT_FOUND) # Get all of the .po files file(GLOB LANG_SRCS_PO RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.*.po") - sort_list(LANG_SRCS_PO) + list(SORT LANG_SRCS_PO) foreach(LANG_PO ${LANG_SRCS_PO}) # Get the domain for this language file |