removed version number from the include path

cisco · Aug 2, 2023 · ee9abac · ee9abac
1 parent b47783f
commit ee9abac
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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})