From f3c8c6a2624816fb8d73876d95f7b8ac2f32a3d0 Mon Sep 17 00:00:00 2001
From: Richard Barnes <rlb@ipv.sx>
Date: Wed, 13 Dec 2023 16:34:36 -0500
Subject: [PATCH] Revert remaining build / code changes

---
 CMakeLists.txt                      | 173 ++++++++++++++--------------
 lib/CMakeLists.txt                  |   4 +-
 lib/mls_vectors/test/CMakeLists.txt |   2 +-
 src/common.cpp                      |   2 -
 test/CMakeLists.txt                 |   4 +-
 5 files changed, 91 insertions(+), 94 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9dba75c0..8875b9fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,90 +137,91 @@ add_subdirectory(lib)
 # Third-Party libraries in tree
 add_subdirectory(third_party)
 
-# ###
-# ### Library Config
-# ###
-# 
-# set(LIB_NAME "${PROJECT_NAME}")
-# 
-# file(GLOB_RECURSE LIB_HEADERS CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
-# file(GLOB_RECURSE LIB_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
-# 
-# add_library(${LIB_NAME} ${LIB_HEADERS} ${LIB_SOURCES})
-# add_dependencies(${LIB_NAME} bytes tls_syntax hpke)
-# target_link_libraries(${LIB_NAME} bytes tls_syntax hpke)
-# target_include_directories(${LIB_NAME}
-#   PUBLIC
-#     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-#     $<INSTALL_INTERFACE:include/${PROJECT_NAME}>
-#   PRIVATE
-#     ${OPENSSL_INCLUDE_DIR}
-# )
-# 
-# install(TARGETS ${LIB_NAME} EXPORT mlspp-targets)
-# 
-# ###
-# ### Tests
-# ###
-# if(TESTING)
-#   add_subdirectory(test)
-# endif()
-# 
-# ###
-# ### Exports
-# ###
-# set(CMAKE_EXPORT_PACKAGE_REGISTRY ON)
-# export(
-#   EXPORT
-#     mlspp-targets
-#   NAMESPACE
-#     ${MLS_EXPORT_NAMESPACE}::
-#   FILE
-#     ${MLS_EXPORT_NAMESPACE}Targets.cmake)
-# export(PACKAGE ${MLS_EXPORT_NAMESPACE})
-# 
-# configure_package_config_file(cmake/config.cmake.in
-#   ${CMAKE_CURRENT_BINARY_DIR}/${MLS_EXPORT_NAMESPACE}Config.cmake
-#   INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/${MLS_EXPORT_NAMESPACE}
-#   NO_SET_AND_CHECK_MACRO)
-# 
-# write_basic_package_version_file(
-#   ${CMAKE_CURRENT_BINARY_DIR}/${MLS_EXPORT_NAMESPACE}ConfigVersion.cmake
-#   VERSION ${PROJECT_VERSION}
-#   COMPATIBILITY SameMajorVersion)
-# 
-# ###
-# ### Install
-# ###
-# 
-# install(
-#   EXPORT
-#     mlspp-targets
-#   NAMESPACE
-#     ${MLS_EXPORT_NAMESPACE}::
-#   FILE
-#     ${MLS_EXPORT_NAMESPACE}Targets.cmake
-#   DESTINATION
-#     ${CMAKE_INSTALL_DATADIR}/${MLS_EXPORT_NAMESPACE})
-# 
-# install(
-#   DIRECTORY
-#     include/
-#   DESTINATION
-#     ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
-# 
-# install(
-#   FILES
-#     ${CMAKE_CURRENT_BINARY_DIR}/${MLS_EXPORT_NAMESPACE}Config.cmake
-#     ${CMAKE_CURRENT_BINARY_DIR}/${MLS_EXPORT_NAMESPACE}ConfigVersion.cmake
-#   DESTINATION
-#     ${CMAKE_INSTALL_DATADIR}/${MLS_EXPORT_NAMESPACE})
-# 
-# install(
-#   FILES
-#     ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
-#   DESTINATION
-#     ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}
-#   RENAME
-#     copyright)
+
+###
+### Library Config
+###
+
+set(LIB_NAME "${PROJECT_NAME}")
+
+file(GLOB_RECURSE LIB_HEADERS CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
+file(GLOB_RECURSE LIB_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
+
+add_library(${LIB_NAME} ${LIB_HEADERS} ${LIB_SOURCES})
+add_dependencies(${LIB_NAME} bytes tls_syntax hpke)
+target_link_libraries(${LIB_NAME} bytes tls_syntax hpke)
+target_include_directories(${LIB_NAME}
+  PUBLIC
+    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:include/${PROJECT_NAME}>
+  PRIVATE
+    ${OPENSSL_INCLUDE_DIR}
+)
+
+install(TARGETS ${LIB_NAME} EXPORT mlspp-targets)
+
+###
+### Tests
+###
+if(TESTING)
+  add_subdirectory(test)
+endif()
+
+###
+### Exports
+###
+set(CMAKE_EXPORT_PACKAGE_REGISTRY ON)
+export(
+  EXPORT
+    mlspp-targets
+  NAMESPACE
+    ${MLS_EXPORT_NAMESPACE}::
+  FILE
+    ${MLS_EXPORT_NAMESPACE}Targets.cmake)
+export(PACKAGE ${MLS_EXPORT_NAMESPACE})
+
+configure_package_config_file(cmake/config.cmake.in
+  ${CMAKE_CURRENT_BINARY_DIR}/${MLS_EXPORT_NAMESPACE}Config.cmake
+  INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/${MLS_EXPORT_NAMESPACE}
+  NO_SET_AND_CHECK_MACRO)
+
+write_basic_package_version_file(
+  ${CMAKE_CURRENT_BINARY_DIR}/${MLS_EXPORT_NAMESPACE}ConfigVersion.cmake
+  VERSION ${PROJECT_VERSION}
+  COMPATIBILITY SameMajorVersion)
+
+###
+### Install
+###
+
+install(
+  EXPORT
+    mlspp-targets
+  NAMESPACE
+    ${MLS_EXPORT_NAMESPACE}::
+  FILE
+    ${MLS_EXPORT_NAMESPACE}Targets.cmake
+  DESTINATION
+    ${CMAKE_INSTALL_DATADIR}/${MLS_EXPORT_NAMESPACE})
+
+install(
+  DIRECTORY
+    include/
+  DESTINATION
+    ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
+
+install(
+  FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/${MLS_EXPORT_NAMESPACE}Config.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/${MLS_EXPORT_NAMESPACE}ConfigVersion.cmake
+  DESTINATION
+    ${CMAKE_INSTALL_DATADIR}/${MLS_EXPORT_NAMESPACE})
+
+install(
+  FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
+  DESTINATION
+    ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}
+  RENAME
+    copyright)
 
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index aabf4fa8..31f9546e 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_subdirectory(bytes)
-# add_subdirectory(hpke)
+add_subdirectory(hpke)
 add_subdirectory(tls_syntax)
-# add_subdirectory(mls_vectors)
+add_subdirectory(mls_vectors)
diff --git a/lib/mls_vectors/test/CMakeLists.txt b/lib/mls_vectors/test/CMakeLists.txt
index 360f03aa..6256ddbf 100644
--- a/lib/mls_vectors/test/CMakeLists.txt
+++ b/lib/mls_vectors/test/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB TEST_SOURCES CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
 add_executable(${TEST_APP_NAME} ${TEST_SOURCES})
 add_dependencies(${TEST_APP_NAME} ${CURRENT_LIB_NAME} bytes tls_syntax)
-target_link_libraries(${TEST_APP_NAME} ${CURRENT_LIB_NAME} bytes tls_syntax doctest::doctest)
+target_link_libraries(${TEST_APP_NAME} ${CURRENT_LIB_NAME} doctest::doctest)
 
 # Enable CTest
 include(doctest)
diff --git a/src/common.cpp b/src/common.cpp
index 0a0eb59e..c0185aa5 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -3,8 +3,6 @@
 
 namespace MLS_NAMESPACE {
 
-// XXX BOGUS COMMENT
-
 uint64_t
 seconds_since_epoch()
 {
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0bdb081e..5a9b5d18 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -9,9 +9,7 @@ file(GLOB TEST_SOURCES CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 add_executable(${TEST_APP_NAME} ${TEST_SOURCES})
 add_dependencies(${TEST_APP_NAME} ${LIB_NAME} bytes tls_syntax mls_vectors)
 target_include_directories(${TEST_APP_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src)
-target_link_libraries(${TEST_APP_NAME} ${LIB_NAME} 
-  bytes tls_syntax mls_vectors mls_vectors 
-  doctest::doctest OpenSSL::Crypto)
+target_link_libraries(${TEST_APP_NAME} mls_vectors doctest::doctest)
 
 # Enable CTest
 include(doctest)