From ee9abac961a507024625bbe2be65996b4f8f7215 Mon Sep 17 00:00:00 2001
From: Greg Hewett <ghewett@cisco.com>
Date: Wed, 2 Aug 2023 17:05:35 -0500
Subject: [PATCH] removed version number from the include path

---
 CMakeLists.txt                 | 4 ++--
 lib/bytes/CMakeLists.txt       | 4 ++--
 lib/hpke/CMakeLists.txt        | 4 ++--
 lib/mls_vectors/CMakeLists.txt | 4 ++--
 lib/tls_syntax/CMakeLists.txt  | 4 ++--
 third_party/CMakeLists.txt     | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eebbfc10..2e4327f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,7 +109,7 @@ 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}-${PROJECT_VERSION}>
+    $<INSTALL_INTERFACE:include/${PROJECT_NAME}>
   PRIVATE
     ${OPENSSL_INCLUDE_DIR}
 )
@@ -150,7 +150,7 @@ install(
   DIRECTORY
     include/
   DESTINATION
-    ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}-${PROJECT_VERSION})
+    ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
 
 install(
   FILES
diff --git a/lib/bytes/CMakeLists.txt b/lib/bytes/CMakeLists.txt
index ad4165c4..f5ab674e 100644
--- a/lib/bytes/CMakeLists.txt
+++ b/lib/bytes/CMakeLists.txt
@@ -13,7 +13,7 @@ target_link_libraries(${CURRENT_LIB_NAME} tls_syntax)
 target_include_directories(${CURRENT_LIB_NAME}
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include/${PROJECT_NAME}-${PROJECT_VERSION}>
+    $<INSTALL_INTERFACE:include/${PROJECT_NAME}>
 )
 
 ###
@@ -25,7 +25,7 @@ install(
   DIRECTORY
     include/
   DESTINATION
-    ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}-${PROJECT_VERSION}
+    ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
 )
 
 ###
diff --git a/lib/hpke/CMakeLists.txt b/lib/hpke/CMakeLists.txt
index 44806c4e..30cf5aa9 100644
--- a/lib/hpke/CMakeLists.txt
+++ b/lib/hpke/CMakeLists.txt
@@ -18,7 +18,7 @@ target_link_libraries(${CURRENT_LIB_NAME} PRIVATE bytes tls_syntax OpenSSL::Cryp
 target_include_directories(${CURRENT_LIB_NAME}
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include/${PROJECT_NAME}-${PROJECT_VERSION}>
+    $<INSTALL_INTERFACE:include/${PROJECT_NAME}>
 )
 
 ###
@@ -30,7 +30,7 @@ install(
   DIRECTORY
     include/
   DESTINATION
-    ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}-${PROJECT_VERSION}
+    ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
 )
 
 ###
diff --git a/lib/mls_vectors/CMakeLists.txt b/lib/mls_vectors/CMakeLists.txt
index a115a431..6816d7f8 100644
--- a/lib/mls_vectors/CMakeLists.txt
+++ b/lib/mls_vectors/CMakeLists.txt
@@ -13,7 +13,7 @@ target_link_libraries(${CURRENT_LIB_NAME} mlspp bytes tls_syntax)
 target_include_directories(${CURRENT_LIB_NAME}
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include/${PROJECT_NAME}-${PROJECT_VERSION}>
+    $<INSTALL_INTERFACE:include/${PROJECT_NAME}>
 )
 
 ###
@@ -25,7 +25,7 @@ install(
   DIRECTORY
     include/
   DESTINATION
-    ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}-${PROJECT_VERSION}
+    ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
 )
 
 ###
diff --git a/lib/tls_syntax/CMakeLists.txt b/lib/tls_syntax/CMakeLists.txt
index 7561d426..43c75c20 100644
--- a/lib/tls_syntax/CMakeLists.txt
+++ b/lib/tls_syntax/CMakeLists.txt
@@ -13,7 +13,7 @@ target_link_libraries(${CURRENT_LIB_NAME} third_party)
 target_include_directories(${CURRENT_LIB_NAME}
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include/${PROJECT_NAME}-${PROJECT_VERSION}>
+    $<INSTALL_INTERFACE:include/${PROJECT_NAME}>
 )
 
 ###
@@ -25,7 +25,7 @@ install(
   DIRECTORY
     include/
   DESTINATION
-    ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}-${PROJECT_VERSION}
+    ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
 )
 
 ###
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index b9f59a78..c1612f59 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -4,7 +4,7 @@ add_library(${CURRENT_LIB_NAME} INTERFACE)
 target_include_directories(${CURRENT_LIB_NAME}
   INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-    $<INSTALL_INTERFACE:include/${PROJECT_NAME}-${PROJECT_VERSION}>
+    $<INSTALL_INTERFACE:include/${PROJECT_NAME}>
 )
 
 ###
@@ -14,4 +14,4 @@ target_include_directories(${CURRENT_LIB_NAME}
 install(TARGETS ${CURRENT_LIB_NAME} EXPORT mlspp-targets)
 install(FILES variant.hpp 
         DESTINATION
-            ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}-${PROJECT_VERSION})
+            ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})