Fix install file

asyncvlsi · Nov 29, 2021 · b2bc025 · b2bc025
1 parent 4e89ee9
commit b2bc025
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,8 +8,9 @@ jobs:
      steps:
        - checkout
        - run: |
+          cat act/lang/.gitignore
           apt-get -q update -y
-          apt-get -q install -y libedit-dev zlib1g-dev m4 build-essential
+          apt-get -q install -y libedit-dev zlib1g-dev m4 build-essential cmake
           mkdir install
           export VLSI_TOOLS_SRC=`pwd`
           export ACT_HOME=$VLSI_TOOLS_SRC/install
@@ -24,7 +25,7 @@ jobs:
        - run: |
           yum install -y 'dnf-command(config-manager)'
           yum config-manager --set-enabled powertools -y
-          yum install -y gcc gcc-c++ diffutils make libedit-devel zlib-devel m4
+          yum install -y gcc gcc-c++ diffutils make libedit-devel zlib-devel m4 cmake
           mkdir install
           export VLSI_TOOLS_SRC=`pwd`
           export ACT_HOME=$VLSI_TOOLS_SRC/install

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(${CMAKE_BINARY_DIR}/)
 
 # set(CMAKE_CXX_COMPILER "clang++")
 set(CMAKE_CXX_FLAGS
-    "${CMAKE_CXX_FLAGS} -std=c++20 -O2 -g -fsanitize=undefined -march=native -DARCH_x86_64 -DOS_linux5_14_9 -DBASEOS_linux" #  -Wall -Wpedantic -Werror"
+    "${CMAKE_CXX_FLAGS} -std=c++14 -O2 -g -fsanitize=undefined -march=native -DARCH_x86_64 -DOS_linux5_14_9 -DBASEOS_linux" #  -Wall -Wpedantic -Werror"
 )
 
 set(CMAKE_EXE_LINKER_FLAGS "-ldl")

diff --git a/act/common/CMakeLists.txt b/act/common/CMakeLists.txt
@@ -65,6 +65,7 @@ set_target_properties(
 set_target_properties(ActCommon PROPERTIES OUTPUT_NAME actcommon)
 
 install (TARGETS ActCommon
+    ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib
     PUBLIC_HEADER DESTINATION include/act/common
 )
diff --git a/act/lang/CMakeLists.txt b/act/lang/CMakeLists.txt
@@ -30,14 +30,12 @@ add_custom_command(
           lang.m4
           namespaces.m4
           types.m4
-          expr.c
           expr.h)
 
 add_library(
   ActLang
   act_walk.extra.h
   lang.h
-  expr.h
   ${CMAKE_CURRENT_BINARY_DIR}/act_parse_id.h
   ${CMAKE_CURRENT_BINARY_DIR}/act_parse.h
   ${CMAKE_CURRENT_BINARY_DIR}/act_parse_int.h
@@ -58,6 +56,7 @@ add_library(
   warn.def
   act_id.h
   inline.h
+  expr.h
   expr.c
   path.c
   expr_extra.c
@@ -97,6 +96,7 @@ set_target_properties(ActLang PROPERTIES OUTPUT_NAME actlang)
 
 add_subdirectory(test)
 install (TARGETS ActLang
+    ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib
     PUBLIC_HEADER DESTINATION include/act/lang
 )

diff --git a/act/lang/expr.h b/act/lang/expr.h
@@ -21,6 +21,7 @@
  *
  **************************************************************************
  */
+
 #ifndef __EXPR_H__
 #define __EXPR_H__
 

diff --git a/act/miniscm/CMakeLists.txt b/act/miniscm/CMakeLists.txt
@@ -35,6 +35,7 @@ set_target_properties(
 set_target_properties(ActMiniScheme PROPERTIES OUTPUT_NAME actscm)
 
 install (TARGETS ActMiniScheme
+    ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib
     PUBLIC_HEADER DESTINATION include/act/miniscm
 )
diff --git a/act/passes/CMakeLists.txt b/act/passes/CMakeLists.txt
@@ -28,6 +28,7 @@ set_target_properties(ActPasses PROPERTIES OUTPUT_NAME actpass)
 
 
 install (TARGETS ActPasses
+    ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib
     PUBLIC_HEADER DESTINATION include/act/passes
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ @@
      *
      **************************************************************************
      */
     #ifndef __EXPR_H__
     #define __EXPR_H__
@@ Expand Down @@