A bunch of CMake fixes

CMakeLists.txt

@@ -1,32 +1,18 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.9...3.31)
 project(aws-c-compression C)
 
-if (DEFINED CMAKE_PREFIX_PATH)
-    file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
+if (NOT IN_SOURCE_BUILD)
+    # this is required so we can use aws-c-common's CMake modules
+    find_package(aws-c-common REQUIRED)
 endif()
 
-if (DEFINED CMAKE_INSTALL_PREFIX)
-    file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" CMAKE_INSTALL_PREFIX)
-endif()
-
-if (UNIX AND NOT APPLE)
-    include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-endif()
-
-# This is required in order to append /lib/cmake to each element in CMAKE_PREFIX_PATH
-set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
-string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
-# Append that generated list to the module search path
-list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
-
 include(AwsCFlags)
 include(AwsCheckHeaders)
 include(AwsSharedLibSetup)
 include(AwsSanitizers)
 include(CheckCCompilerFlag)
 include(AwsFindPackage)
+include(GNUInstallDirs)
 
 file(GLOB AWS_COMPRESSION_HEADERS
         "include/aws/compression/*.h"
@@ -74,8 +60,8 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS})
 aws_prepare_shared_lib_exports(${PROJECT_NAME})
 
 aws_check_headers(${PROJECT_NAME} ${AWS_COMPRESSION_HEADERS})
-install(FILES ${AWS_COMPRESSION_HEADERS} DESTINATION "include/aws/compression")
-install(FILES ${AWS_COMPRESSION_TESTING_HEADERS} DESTINATION "include/aws/testing/compression")
+install(FILES ${AWS_COMPRESSION_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/compression")
+install(FILES ${AWS_COMPRESSION_TESTING_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/testing/compression")
 
 if (BUILD_SHARED_LIBS)
    set (TARGET_DIR "shared")
@@ -84,7 +70,7 @@ else()
 endif()
 
 install(EXPORT "${PROJECT_NAME}-targets"
-        DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/${TARGET_DIR}"
         NAMESPACE AWS::
         COMPONENT Development)
 
@@ -93,7 +79,7 @@ configure_file("cmake/${PROJECT_NAME}-config.cmake"
         @ONLY)
 
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
-        DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/"
         COMPONENT Development)
 
 option(BUILD_HUFFMAN_GENERATOR "Whether or not to build the aws-c-common-huffman-generator tool" OFF)

source/huffman_generator/CMakeLists.txt

@@ -16,5 +16,5 @@ endif ()
 
 install(
         TARGETS ${GENERATOR_BINARY_NAME}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )

source/huffman_generator/generator.c

@@ -4,7 +4,6 @@
  */
 
 #include <assert.h> /* NOLINT(fuchsia-restrict-system-includes) */
-#include <aws/common/file.h>
 #include <ctype.h>
 #include <stdint.h> /* NOLINT(fuchsia-restrict-system-includes) */
 #include <stdio.h>
@@ -43,7 +42,7 @@ static size_t read_past_comma(const char *str) {
 int read_code_points(const char *input_path) {
 
     memset(code_points, 0, sizeof(code_points));
-    FILE *file = aws_fopen(input_path, "r");
+    FILE *file = fopen(input_path, "r");
     if (!file) {
         printf("Failed to open file '%s' for read.", input_path);
         return 1;
@@ -279,7 +278,7 @@ int main(int argc, char *argv[]) {
     }
 
     /* Open the file */
-    FILE *file = aws_fopen(output_file, "w");
+    FILE *file = fopen(output_file, "w");
     if (!file) {
         printf("Failed to open file '%s' for write.", output_file);
         return 1;