Merge branch 'rebase-cmake-build' into fix-library-config

Author: jeronstone

cmake/FindQCBOR.cmake

@@ -9,4 +9,3 @@ set_target_properties(QCBOR::qcbor PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES "${QCBOR_HEADER}"
   IMPORTED_LOCATION "${QCBOR_LIB}"
 )
-target_link_libraries(QCBOR::qcbor INTERFACE m)

deps/QCBOR

@@ -51,18 +51,76 @@ target_include_directories(
   $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/bsl>
 )
 
+# Crypto Library
+set(BSL_CRYPTO_C
+  ${CMAKE_CURRENT_SOURCE_DIR}/crypto/CryptoInterface.c
+)
+
+add_library(bsl_crypto)
+target_sources(bsl_crypto PUBLIC ${BSL_CRYPTO_C})
+add_compile_options(-include ${CMAKE_CURRENT_BINARY_DIR}/BSLConfig.h)
+target_compile_options(bsl_crypto PRIVATE -Wshadow -Wpointer-arith -Wstrict-prototypes
+                       -Wmissing-prototypes -Wredundant-decls -Wcast-align
+                       -Wformat=2 -Wswitch-enum -Wlogical-op -Wduplicated-branches
+                       -fno-strict-aliasing -Werror=format-security -fno-common
+                       -Wstrict-aliasing=2)
+target_link_libraries(bsl_crypto PUBLIC bsl_front)
+target_link_libraries(bsl_crypto PUBLIC MLIB::mlib)
+target_link_libraries(bsl_crypto INTERFACE OpenSSL::Crypto)
+
+# Default Security Context library
+set(BSL_DEFAULT_SC_H
+    ${CMAKE_CURRENT_SOURCE_DIR}/security_context/DefaultSecContext.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/security_context/DefaultSecContext_Private.h
+)
+
+set(BSL_DEFAULT_SC_C
+  ${CMAKE_CURRENT_SOURCE_DIR}/security_context/DefaultSecContext.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/security_context/BCB_AES_GCM.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/security_context/BIB_HMAC_SHA2.c
+)
+
+add_library(bsl_default_sc)
+target_sources(bsl_default_sc PUBLIC ${BSL_DEFAULT_SC_H})
+target_sources(bsl_default_sc PUBLIC ${BSL_DEFAULT_SC_C})
+add_compile_options(-include ${CMAKE_CURRENT_BINARY_DIR}/BSLConfig.h)
+target_compile_options(bsl_default_sc PRIVATE -Wshadow -Wpointer-arith -Wstrict-prototypes
+                       -Wmissing-prototypes -Wredundant-decls -Wcast-align
+                       -Wformat=2 -Wswitch-enum -Wlogical-op -Wduplicated-branches
+                       -fno-strict-aliasing -Werror=format-security -fno-common
+                       -Wstrict-aliasing=2)
+target_link_libraries(bsl_default_sc PUBLIC bsl_front)
+target_link_libraries(bsl_default_sc PUBLIC bsl_crypto)
+target_link_libraries(bsl_default_sc PUBLIC QCBOR::qcbor)
+
+# Example Policy Provider library
+set(BSL_SAMPLE_PP_H
+  ${CMAKE_CURRENT_SOURCE_DIR}/policy_provider/SamplePolicyProvider.h
+)
+
+set(BSL_SAMPLE_PP_C
+  ${CMAKE_CURRENT_SOURCE_DIR}/policy_provider/SamplePolicyProvider.c
+)
+
+add_library(bsl_sample_pp)
+target_sources(bsl_sample_pp PUBLIC ${BSL_SAMPLE_PP_H})
+target_sources(bsl_sample_pp PUBLIC ${BSL_SAMPLE_PP_C})
+add_compile_options(-include ${CMAKE_CURRENT_BINARY_DIR}/BSLConfig.h)
+target_compile_options(bsl_sample_pp PRIVATE -Wshadow -Wpointer-arith -Wstrict-prototypes
+                       -Wmissing-prototypes -Wredundant-decls -Wcast-align
+                       -Wformat=2 -Wswitch-enum -Wlogical-op -Wduplicated-branches
+                       -fno-strict-aliasing -Werror=format-security -fno-common
+                       -Wstrict-aliasing=2)
+target_link_libraries(bsl_sample_pp PUBLIC bsl_front)
+
 # Dynamic backend library
 set(BSL_DYNAMIC_H
   ${CMAKE_CURRENT_SOURCE_DIR}/backend/PublicInterfaceImpl.h
   ${CMAKE_CURRENT_SOURCE_DIR}/backend/UtilDefs_SeqReadWrite.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/security_context/DefaultSecContext.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/security_context/DefaultSecContext_Private.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/policy_provider/SamplePolicyProvider.h
 )
 
 set(BSL_DYNAMIC_C
   ${CMAKE_CURRENT_SOURCE_DIR}/backend/AbsSecBlock.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/backend/CryptoInterface.c
   ${CMAKE_CURRENT_SOURCE_DIR}/backend/UtilDefs_Data.c
   ${CMAKE_CURRENT_SOURCE_DIR}/backend/HostInterface.c
   ${CMAKE_CURRENT_SOURCE_DIR}/backend/PublicInterfaceImpl.c
@@ -76,10 +134,6 @@ set(BSL_DYNAMIC_C
   ${CMAKE_CURRENT_SOURCE_DIR}/backend/SecurityContext.c
   ${CMAKE_CURRENT_SOURCE_DIR}/backend/SecurityResultSet.c
   ${CMAKE_CURRENT_SOURCE_DIR}/backend/UtilDefs_SeqReadWrite.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/policy_provider/SamplePolicyProvider.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/security_context/DefaultSecContext.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/security_context/BCB_AES_GCM.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/security_context/BIB_HMAC_SHA2.c
 )
 
 add_library(bsl_dynamic)
@@ -94,9 +148,6 @@ set_target_properties(bsl_dynamic
 target_link_libraries(bsl_dynamic PUBLIC bsl_front)
 target_link_libraries(bsl_dynamic PUBLIC MLIB::mlib)
 target_link_libraries(bsl_dynamic PUBLIC QCBOR::qcbor)
-target_link_libraries(bsl_dynamic PUBLIC OpenSSL::SSL)
-target_link_libraries(bsl_dynamic PUBLIC Threads::Threads)
-
 
 add_subdirectory(mock_bpa)
 find_program(CLANG_FORMAT "clang-format")

deps/mlib

@@ -54,7 +54,7 @@ set_target_properties(bsl_mock_bpa
         VERSION ${CMAKE_PROJECT_VERSION}
         SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR}
 )
-target_link_libraries(bsl_mock_bpa PUBLIC bsl_front QCBOR::qcbor MLIB::mlib)
+target_link_libraries(bsl_mock_bpa PUBLIC bsl_front bsl_default_sc bsl_sample_pp)
 
 add_executable(bsl-mock-bpa)
 target_sources(bsl-mock-bpa PRIVATE mock_bpa.c)