use GnuInstallDirs

Author: xtofalex

.gitignore

@@ -1,3 +1,4 @@
 build
+install
 *~
 *.swp

CMakeLists.txt

@@ -8,6 +8,8 @@ project(naja-verilog LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 
+include(GNUInstallDirs)
+
 #For Finding flex include path on MacOS with homebrew installation
 set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} /opt/homebrew/opt/flex/include)
 set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} /usr/local/opt/flex/include)

cmake/CMakeLists.txt

@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-install(FILES FindNajaVerilog.cmake DESTINATION cmake)
+install(FILES FindNajaVerilog.cmake DESTINATION ${CMAKE_INSTALL_DATADIR}/naja-verilog/cmake)

src/CMakeLists.txt

@@ -30,7 +30,9 @@ target_include_directories(naja_verilog
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 set_target_properties(naja_verilog PROPERTIES PUBLIC_HEADER "${HEADERS}")
-install(TARGETS naja_verilog LIBRARY DESTINATION lib PUBLIC_HEADER DESTINATION include) 
+install(TARGETS naja_verilog
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 add_executable(naja_verilog_test NajaVerilogSnippet.cpp)
 target_link_libraries(naja_verilog_test naja_verilog)

test/CMakeLists.txt

@@ -15,6 +15,7 @@ set(tests
   NajaVerilogTest8.cpp
   NajaVerilogTest9.cpp
   NajaVerilogTest10.cpp
+  NajaVerilogTest11.cpp
   NajaVerilogTestMultipleFiles.cpp
   NajaVerilogTestErrors.cpp
 )

test/NajaVerilogTest11.cpp

@@ -0,0 +1,56 @@
+// SPDX-FileCopyrightText: 2024 The Naja verilog authors <https://github.com/najaeda/naja-verilog/blob/main/AUTHORS>
+//
+// SPDX-License-Identifier: Apache-2.0
+
+#include "gtest/gtest.h"
+
+#include <filesystem>
+#include <fstream>
+
+#include "VerilogConstructor.h"
+
+using namespace naja::verilog;
+
+#include "VerilogConstructorTest.h"
+
+#ifndef NAJA_VERILOG_BENCHMARKS
+#define NAJA_VERILOG_BENCHMARKS "Undefined"
+#endif
+
+TEST(NajaVerilogTest11, test) {
+  VerilogConstructorTest constructor;
+  std::filesystem::path test11Path(
+      std::filesystem::path(NAJA_VERILOG_BENCHMARKS)
+      / std::filesystem::path("benchmarks")
+      / std::filesystem::path("test11.v"));
+
+  constructor.setFirstPass(true);
+  constructor.parse(test11Path);
+  ASSERT_EQ(1, constructor.modules_.size());
+  auto test = constructor.modules_[0];
+  EXPECT_TRUE(test->ports_.empty());
+  EXPECT_TRUE(test->nets_.empty());
+  EXPECT_TRUE(test->assigns_.empty());
+  EXPECT_TRUE(test->instances_.empty());
+  constructor.setFirstPass(false);
+  constructor.parse(test11Path);
+
+  ASSERT_EQ(1, constructor.modules_.size());
+  EXPECT_TRUE(test->ports_.empty());
+  EXPECT_TRUE(test->nets_.empty());
+  EXPECT_TRUE(test->assigns_.empty());
+  EXPECT_EQ(1, test->instances_.size());
+  auto instance = test->instances_[0];
+  EXPECT_EQ("ins", instance.identifier_.name_);
+  EXPECT_EQ("MOD", instance.model_.name_);
+  EXPECT_EQ(2, instance.parameterAssignments_.size());
+  using Parameters = std::vector<std::pair<std::string, std::string>>;
+  Parameters parameters;
+  for (const auto& [parameter, value]: instance.parameterAssignments_) {
+    parameters.push_back({parameter, value});
+  }
+  EXPECT_EQ("elem10", parameters[0].first);
+  EXPECT_EQ("'o0", parameters[0].second);
+  EXPECT_EQ("elem11", parameters[1].first);
+  EXPECT_EQ("8'o84", parameters[1].second);
+}

test/benchmarks/test11.v

@@ -0,0 +1,11 @@
+module test11();
+//test octal
+
+MOD
+  #(
+   .elem10('o0),
+   .elem11(8'o84)
+  )
+  ins();
+
+endmodule