From d534c4550aff015f5b72ea74d08a70149b958674 Mon Sep 17 00:00:00 2001 From: srydell Date: Fri, 18 Mar 2022 15:11:30 +0100 Subject: [PATCH] Use versioned release of IR --- CMakeLists.txt | 9 +++------ cmake/packaging/IRConfig.cmake | 1 - docs/ReleaseNotes/v0.2.1.md | 3 +++ tools/packaging/CMakeLists.txt | 6 ------ 4 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 cmake/packaging/IRConfig.cmake create mode 100644 docs/ReleaseNotes/v0.2.1.md diff --git a/CMakeLists.txt b/CMakeLists.txt index 447b049..f6b9548 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) project( Parser - VERSION 0.2.0 + VERSION 0.2.1 LANGUAGES CXX) configure_file(docs/ReleaseNotes/version.in @@ -32,11 +32,8 @@ include(${modules}/StaticAnalyzers.cmake) # Define enable_sanitizers include(${modules}/Sanitizers.cmake) -FetchContent_Declare( - IRSpecification - GIT_REPOSITORY https://github.com/Tolc-Software/IntermediateRepresentation.git - GIT_TAG main) -FetchContent_MakeAvailable(IRSpecification) +include(${modules}/GetIR.cmake) +get_ir(VERSION v0.11.0) FetchContent_Declare( ctre_content diff --git a/cmake/packaging/IRConfig.cmake b/cmake/packaging/IRConfig.cmake deleted file mode 100644 index 013ea7f..0000000 --- a/cmake/packaging/IRConfig.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/IRTargets.cmake") diff --git a/docs/ReleaseNotes/v0.2.1.md b/docs/ReleaseNotes/v0.2.1.md new file mode 100644 index 0000000..8c58214 --- /dev/null +++ b/docs/ReleaseNotes/v0.2.1.md @@ -0,0 +1,3 @@ +## Internal ## + +* Use versioned release of IR diff --git a/tools/packaging/CMakeLists.txt b/tools/packaging/CMakeLists.txt index 5d3754e..1ba9755 100644 --- a/tools/packaging/CMakeLists.txt +++ b/tools/packaging/CMakeLists.txt @@ -57,12 +57,6 @@ install( DESTINATION .) -# Export IR -install(TARGETS IR EXPORT IRTargets PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/IR) -install(EXPORT IRTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/IR NAMESPACE IR::) -install(FILES ${CMAKE_SOURCE_DIR}/cmake/packaging/IRConfig.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/IR) - set(CPACK_VERBATIM_VARIABLES YES) # Allow packaging include(CPack)