From 4aa3e7250918310f841377987a9cec23bc728e52 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Fri, 3 Feb 2023 17:16:39 -0500 Subject: [PATCH] Fix cmake 3.12+ warnings on MSWIN. --- CMakeLists.txt | 2 +- examples/cmake_hello_c/CMakeLists.txt | 3 ++- examples/cmake_hello_sc/CMakeLists.txt | 3 ++- examples/cmake_protect_lib/CMakeLists.txt | 3 ++- examples/cmake_tracing_c/CMakeLists.txt | 3 ++- examples/cmake_tracing_sc/CMakeLists.txt | 4 +++- test_regress/CMakeLists.txt | 3 ++- test_regress/t/t_hier_block_cmake/CMakeLists.txt | 3 ++- verilator-config.cmake.in | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 537caf740..9b9d0e092 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ cmake_minimum_required(VERSION 3.15) cmake_policy(SET CMP0091 NEW) # Use MSVC_RUNTIME_LIBRARY to select the runtime project(Verilator - VERSION 5.003 + VERSION 5.007 HOMEPAGE_URL https://verilator.org LANGUAGES CXX ) diff --git a/examples/cmake_hello_c/CMakeLists.txt b/examples/cmake_hello_c/CMakeLists.txt index 09abc8016..679abcc33 100644 --- a/examples/cmake_hello_c/CMakeLists.txt +++ b/examples/cmake_hello_c/CMakeLists.txt @@ -19,7 +19,8 @@ # cmake .. # cmake --build . -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.12) +cmake_policy(SET CMP0074 NEW) project(cmake_hello_c) find_package(verilator HINTS $ENV{VERILATOR_ROOT} ${VERILATOR_ROOT}) diff --git a/examples/cmake_hello_sc/CMakeLists.txt b/examples/cmake_hello_sc/CMakeLists.txt index f85d05c6d..16978bc80 100644 --- a/examples/cmake_hello_sc/CMakeLists.txt +++ b/examples/cmake_hello_sc/CMakeLists.txt @@ -19,7 +19,8 @@ # cmake .. # cmake --build . -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.12) +cmake_policy(SET CMP0074 NEW) project(cmake_hello_sc CXX) find_package(verilator HINTS $ENV{VERILATOR_ROOT} ${VERILATOR_ROOT}) diff --git a/examples/cmake_protect_lib/CMakeLists.txt b/examples/cmake_protect_lib/CMakeLists.txt index de2de27c2..1e09cb5fd 100644 --- a/examples/cmake_protect_lib/CMakeLists.txt +++ b/examples/cmake_protect_lib/CMakeLists.txt @@ -19,7 +19,8 @@ # cmake .. # cmake --build . -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.12) +cmake_policy(SET CMP0074 NEW) project(cmake_protect_lib) find_package(verilator HINTS $ENV{VERILATOR_ROOT} ${VERILATOR_ROOT}) diff --git a/examples/cmake_tracing_c/CMakeLists.txt b/examples/cmake_tracing_c/CMakeLists.txt index 95fb3dfb2..3f69fc3c9 100644 --- a/examples/cmake_tracing_c/CMakeLists.txt +++ b/examples/cmake_tracing_c/CMakeLists.txt @@ -19,7 +19,8 @@ # cmake .. # cmake --build . -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.12) +cmake_policy(SET CMP0074 NEW) project(cmake_tracing_c) find_package(verilator HINTS $ENV{VERILATOR_ROOT} ${VERILATOR_ROOT}) diff --git a/examples/cmake_tracing_sc/CMakeLists.txt b/examples/cmake_tracing_sc/CMakeLists.txt index 0d67a8cf5..58d0aaceb 100644 --- a/examples/cmake_tracing_sc/CMakeLists.txt +++ b/examples/cmake_tracing_sc/CMakeLists.txt @@ -19,7 +19,9 @@ # cmake .. # cmake --build . -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.12) +cmake_policy(SET CMP0074 NEW) + project(cmake_tracing_sc_example CXX) find_package(verilator HINTS $ENV{VERILATOR_ROOT} ${VERILATOR_ROOT}) diff --git a/test_regress/CMakeLists.txt b/test_regress/CMakeLists.txt index fc83ccee5..91e5eab28 100644 --- a/test_regress/CMakeLists.txt +++ b/test_regress/CMakeLists.txt @@ -12,7 +12,8 @@ # ###################################################################### -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.12) +cmake_policy(SET CMP0074 NEW) set(TEST_REQUIRED_VARS NAME CSOURCES OPT_FAST OPT_GLOBAL VERILATOR_ROOT VERILATOR_ARGS VERILATOR_SOURCES SYSTEMC VERBOSE VERILATION) diff --git a/test_regress/t/t_hier_block_cmake/CMakeLists.txt b/test_regress/t/t_hier_block_cmake/CMakeLists.txt index 645be0795..87d396b8b 100644 --- a/test_regress/t/t_hier_block_cmake/CMakeLists.txt +++ b/test_regress/t/t_hier_block_cmake/CMakeLists.txt @@ -10,7 +10,8 @@ # ###################################################################### -cmake_minimum_required (VERSION 3.8) +cmake_minimum_required(VERSION 3.12) +cmake_policy(SET CMP0074 NEW) project (t_hier_block_cmake) find_package(verilator REQUIRED) diff --git a/verilator-config.cmake.in b/verilator-config.cmake.in index 5abcc1711..a2b7db5d1 100644 --- a/verilator-config.cmake.in +++ b/verilator-config.cmake.in @@ -19,7 +19,8 @@ # ###################################################################### -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.12) +cmake_policy(SET CMP0074 NEW) # Prefer VERILATOR_ROOT from environment if (DEFINED ENV{VERILATOR_ROOT})