Add CMakeLists for new modules

Author: simonjbeaumont

.github/workflows/pull_request.yml

@@ -44,6 +44,8 @@ jobs:
             { "name": "CCryptoBoringSSL", "type": "source", "exceptions": [] },
             { "name": "CCryptoBoringSSLShims", "type": "source", "exceptions": [] },
             { "name": "CryptoBoringWrapper", "type": "source", "exceptions": [] },
+            { "name": "CXKCP", "type": "source", "exceptions": [] },
+            { "name": "CXKCPShims", "type": "source", "exceptions": [] },
             { "name": "Crypto", "type": "source", "exceptions": [] },
             { "name": "_CryptoExtras", "type": "source", "exceptions": [] },
             { "name": "CCryptoBoringSSL", "type": "assembly", "exceptions": [ "*/AES/*.swift" ] }

Sources/CMakeLists.txt

@@ -14,6 +14,8 @@
 
 add_subdirectory(CCryptoBoringSSL)
 add_subdirectory(CCryptoBoringSSLShims)
+add_subdirectory(CXKCP)
+add_subdirectory(CXKCPShims)
 add_subdirectory(CryptoBoringWrapper)
 add_subdirectory(Crypto)
 add_subdirectory(_CryptoExtras)

Sources/CXKCP/CMakeLists.txt

@@ -0,0 +1,34 @@
+##===----------------------------------------------------------------------===##
+##
+## This source file is part of the SwiftCrypto open source project
+##
+## Copyright (c) 2021 Apple Inc. and the SwiftCrypto project authors
+## Licensed under Apache License v2.0
+##
+## See LICENSE.txt for license information
+## See CONTRIBUTORS.txt for the list of SwiftCrypto project authors
+##
+## SPDX-License-Identifier: Apache-2.0
+##
+##===----------------------------------------------------------------------===##
+
+add_library(CXKCP STATIC
+  "FIPS202-opt64/KeccakHash.c"
+  "FIPS202-opt64/KeccakP-1600-opt64.c"
+  "FIPS202-opt64/KeccakSponge.c"
+  "FIPS202-opt64/SimpleFIPS202.c"
+)
+
+target_include_directories(CXKCP PUBLIC
+  include)
+
+target_compile_definitions(CXKCP PRIVATE
+  $<$<PLATFORM_ID:Windows>:WIN32_LEAN_AND_MEAN>)
+target_link_libraries(CXKCP PUBLIC
+  $<$<NOT:$<PLATFORM_ID:Darwin>>:dispatch>
+  $<$<NOT:$<PLATFORM_ID:Darwin>>:Foundation>
+  SwiftASN1)
+set_target_properties(CXKCP PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include;${CMAKE_Swift_MODULE_DIRECTORY}")
+
+set_property(GLOBAL APPEND PROPERTY SWIFT_CRYPTO_EXPORTS CXKCP)

Sources/CXKCPShims/CMakeLists.txt

@@ -0,0 +1,29 @@
+##===----------------------------------------------------------------------===##
+##
+## This source file is part of the SwiftCrypto open source project
+##
+## Copyright (c) 2021 Apple Inc. and the SwiftCrypto project authors
+## Licensed under Apache License v2.0
+##
+## See LICENSE.txt for license information
+## See CONTRIBUTORS.txt for the list of SwiftCrypto project authors
+##
+## SPDX-License-Identifier: Apache-2.0
+##
+##===----------------------------------------------------------------------===##
+
+add_library(CXKCPShims STATIC
+  "shims.c"
+)
+
+target_include_directories(CXKCPShims PUBLIC
+  include
+  $<TARGET_PROPERTY:CXKCP,INCLUDE_DIRECTORIES>)
+
+target_link_libraries(CXKCPShims PUBLIC
+  CXKCP)
+
+set_target_properties(CXKCPShims PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
+
+set_property(GLOBAL APPEND PROPERTY SWIFT_CRYPTO_EXPORTS CXKCPShims)

Sources/Crypto/CMakeLists.txt

@@ -118,13 +118,17 @@ endif()
 target_include_directories(Crypto PRIVATE
   $<TARGET_PROPERTY:CCryptoBoringSSL,INCLUDE_DIRECTORIES>
   $<TARGET_PROPERTY:CCryptoBoringSSLShims,INCLUDE_DIRECTORIES>
-  $<TARGET_PROPERTY:CryptoBoringWrapper,INCLUDE_DIRECTORIES>)
+  $<TARGET_PROPERTY:CryptoBoringWrapper,INCLUDE_DIRECTORIES>
+  $<TARGET_PROPERTY:CXKCP,INCLUDE_DIRECTORIES>
+  $<TARGET_PROPERTY:CXKCPShims,INCLUDE_DIRECTORIES>)
 target_link_libraries(Crypto PUBLIC
   $<$<NOT:$<PLATFORM_ID:Darwin>>:dispatch>
   $<$<NOT:$<PLATFORM_ID:Darwin>>:Foundation>
   CCryptoBoringSSL
   CCryptoBoringSSLShims
-  CryptoBoringWrapper)
+  CryptoBoringWrapper
+  CXKCP
+  CXKCPShims)
 target_compile_options(Crypto PRIVATE ${SWIFT_CRYPTO_COMPILE_OPTIONS})
 set_target_properties(Crypto PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})