CMake packaging cleanup/fixes (#214)

* Renamed cmake modules to avoid collisions when installed, added SOVERSION and VERSION to aws-c-common * Use GNUInstallDirs to find where to install built libraries * PR Feedback: leave VERSION and SOVERSION up to leaf projects
awslabs · Dec 17, 2018 · 95d9e6b · 95d9e6b
1 parent 7d0b1ce
commit 95d9e6b
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,9 +16,9 @@ project(aws-c-common C)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(AwsCFlags)
-include(FeatureTests)
-include(Sanitizers)
-include(SIMD)
+include(AwsFeatureTests)
+include(AwsSanitizers)
+include(AwsSIMD)
 
 set(GENERATED_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
 set(GENERATED_INCLUDE_DIR "${GENERATED_ROOT_DIR}/include")
@@ -81,7 +81,7 @@ else ()
 
         set(PLATFORM_LIBS pthread ${CORE_FOUNDATION_LIB})
     elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") # Android does not link to libpthread nor librt, so this is fine
-            set(PLATFORM_LIBS pthread rt)
+        set(PLATFORM_LIBS pthread rt)
     endif()
 endif()
 
@@ -119,6 +119,7 @@ if (AWS_NUM_CPU_CORES)
 endif()
 
 # Our ABI is not yet stable
+set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0)
 set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES SOVERSION 0unstable)
 
 target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
@@ -172,6 +173,11 @@ foreach(HEADER_SRCPATH IN ITEMS ${AWS_COMMON_HEADERS} ${AWS_COMMON_OS_HEADERS} $
 endforeach()
 
 set(LIBRARY_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib)
+# Set the default lib installation path on GNU systems with GNUInstallDirs
+if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND UNIX AND NOT APPLE)
+    include(GNUInstallDirs)
+    set(LIBRARY_DIRECTORY ${CMAKE_INSTALL_LIBDIR})
+endif()
 
 install(TARGETS ${CMAKE_PROJECT_NAME}
     EXPORT ${CMAKE_PROJECT_NAME}-targets
@@ -193,9 +199,9 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
 list(APPEND EXPORT_MODULES
     "cmake/AwsCFlags.cmake"
     "cmake/AwsTestHarness.cmake"
-    "cmake/LibFuzzer.cmake"
-    "cmake/Sanitizers.cmake"
-    "cmake/SIMD.cmake"
+    "cmake/AwsLibFuzzer.cmake"
+    "cmake/AwsSanitizers.cmake"
+    "cmake/AwsSIMD.cmake"
     )
 
 install(FILES ${EXPORT_MODULES} DESTINATION "lib/cmake/")

diff --git a/cmake/FeatureTests.cmake → cmake/AwsFeatureTests.cmake b/cmake/FeatureTests.cmake → cmake/AwsFeatureTests.cmake
diff --git a/cmake/LibFuzzer.cmake → cmake/AwsLibFuzzer.cmake b/cmake/LibFuzzer.cmake → cmake/AwsLibFuzzer.cmake
@@ -12,7 +12,7 @@
 # permissions and limitations under the License.
 
 include(CTest)
-include(Sanitizers)
+include(AwsSanitizers)
 
 option(ENABLE_FUZZ_TESTS "Build and run fuzz tests" OFF)
 set(FUZZ_TESTS_MAX_TIME 60 CACHE STRING "Max time to run each fuzz test")

diff --git a/cmake/SIMD.cmake → cmake/AwsSIMD.cmake b/cmake/SIMD.cmake → cmake/AwsSIMD.cmake
diff --git a/cmake/Sanitizers.cmake → cmake/AwsSanitizers.cmake b/cmake/Sanitizers.cmake → cmake/AwsSanitizers.cmake
diff --git a/cmake/AwsTestHarness.cmake b/cmake/AwsTestHarness.cmake
@@ -12,7 +12,7 @@
 # permissions and limitations under the License.
 
 include(AwsCFlags)
-include(Sanitizers)
+include(AwsSanitizers)
 
 # Registers a test case by name (the first argument to the AWS_TEST_CASE macro in aws_test_harness.h)
 macro(add_test_case name)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-include(LibFuzzer)
+include(AwsLibFuzzer)
 include(AwsTestHarness)
 enable_testing()