Ir2vec.cpp refactor

.github/workflows/publish.yml

@@ -41,7 +41,7 @@ jobs:
       run: cd build && cmake -DEigen3_DIR=./eigen-build ..
     - name: make
       run: cd build && make -j8
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: ir2vec
         path: |

.github/workflows/upload-pypi.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Build sdist
         run: cd Manylinux2014_Compliant_Source/pkg && pipx run build --sdist
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: Manylinux2014_Compliant_Source/pkg/dist/*.tar.gz
 
@@ -44,7 +44,7 @@ jobs:
     needs: [build_wheels, build_sdist]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: artifact
           path: dist

CMakeLists.txt

@@ -17,9 +17,15 @@ endif()
 
 set(CMAKE_CXX_STANDARD 17 CACHE STRING "")
 
+
 # LLVM is normally built without RTTI. Be consistent with that.
-if(NOT LLVM_ENABLE_RTTI)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
+if (NOT LLVM_ENABLE_RTTI)
+  if (TARGET IR2Vec)
+    target_compile_options(IR2Vec PRIVATE -fno-rtti)
+  endif()
+  if (TARGET IR2Vec_Static)
+    target_compile_options(IR2Vec_Static PRIVATE -fno-rtti)
+  endif()
 endif()
 
 add_subdirectory(src)

src/CMakeLists.txt

@@ -73,8 +73,6 @@ if(NOT LLVM_IR2VEC)
   message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
   message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 
-
-
   include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
   # llvm_map_components_to_libnames(llvm_libs all)
   llvm_map_components_to_libnames(llvm_libs support core irreader analysis TransformUtils)
@@ -92,6 +90,12 @@ if(NOT LLVM_IR2VEC)
   add_library(${IR2VEC_LIB} SHARED $<TARGET_OBJECTS:objlib>)
   add_library(${IR2VEC_LIB_STATIC} STATIC $<TARGET_OBJECTS:objlib>)
 
+  # Link LLVM to the libs (PUBLIC so dependents inherit)
+  # target_link_libraries(${IR2VEC_LIB}        PUBLIC ${llvm_libs})
+  # target_link_libraries(${IR2VEC_LIB_STATIC} PUBLIC ${llvm_libs})
+
+  add_subdirectory(bindings)
+
   set_target_properties(${IR2VEC_LIB} ${IR2VEC_LIB_STATIC} PROPERTIES
       VERSION ${PROJECT_VERSION}
       SOVERSION 1