rebase from master

.github/workflows/ci.yml

@@ -441,7 +441,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Delete Artifact
-        uses: geekyeggo/delete-artifact@1-glob-support
+        uses: geekyeggo/delete-artifact@v2
         with:
           name: "*"
           useGlob: true

.github/workflows/docs.yml

@@ -7,8 +7,17 @@ on:
 env:
   BUILD_TYPE: Release
 
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
 jobs:
   doxygen:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -25,6 +34,7 @@ jobs:
         wget https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/$LLVM_NAME.tar.xz
         tar xf $LLVM_NAME.tar.xz
         mv $LLVM_NAME llvm-lib
+
     - name: Create Build Environment
       run: cmake -E make_directory ${{runner.workspace}}/build
 
@@ -40,12 +50,14 @@ jobs:
       shell: bash
       run: cmake --build . --config $BUILD_TYPE --target doc
 
-    - name: Deploy to pages
-      uses: peaceiris/actions-gh-pages@v3
+    - name: Setup Pages
+      uses: actions/configure-pages@v1
+
+    - name: Upload artifact
+      uses: actions/upload-pages-artifact@v1
       with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ${{runner.workspace}}/build/doc/html
-        user_name: 'github-actions[bot]'
-        user_email: 'github-actions[bot]@users.noreply.github.com'
-        force_orphan: true
-        publish_branch: gh-pages
+        path: ${{runner.workspace}}/build/doc/html
+
+    - name: Deploy to GitHub Pages
+      id: deployment
+      uses: actions/deploy-pages@v1

CMakeLists.txt

@@ -236,6 +236,7 @@ if(NOT elfio_srcs_POPULATED)
 	FetchContent_GetProperties(elfio_srcs)
 endif()
 
+### simpleini
 FetchContent_Declare(simpleini_srcs
 	GIT_REPOSITORY https://github.com/brofield/simpleini.git
 	GIT_TAG v4.19
@@ -244,20 +245,19 @@ if(NOT simpleini_srcs_POPULATED)
 	FetchContent_Populate(simpleini_srcs)
 	FetchContent_GetProperties(simpleini_srcs)
 endif()
-add_library(simpleini
+add_library(simpleini OBJECT
     "${simpleini_srcs_SOURCE_DIR}/ConvertUTF.c"
 )
 set_target_properties(simpleini PROPERTIES
     PUBLIC_HEADER "${simpleini_srcs_SOURCE_DIR}/SimpleIni.h;${simpleini_srcs_SOURCE_DIR}/ConvertUTF.h"
 )
 target_include_directories(simpleini PUBLIC
     $<BUILD_INTERFACE:${simpleini_srcs_SOURCE_DIR}>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/simpleini>
 )
 install(TARGETS simpleini
-    PUBLIC_HEADER DESTINATION include
+    PUBLIC_HEADER DESTINATION include/simpleini
 )
-
 FetchContent_Declare(pugixml_srcs
     GIT_REPOSITORY https://github.com/zeux/pugixml.git
     GIT_TAG v1.11.4

JITImpl/TCC/CMakeLists.txt

@@ -82,7 +82,7 @@ if(${TCCJIT_ARCH} STREQUAL unix)
         set(TCC_ADDITIONAL_CFLAGS "-Og -g -Wall")
     endif()
 
-    set(TCCJIT_BINARY_DIR ${CMAKE_BINARY_DIR}/include/jit/tcc)
+    set(TCCJIT_BINARY_DIR ${ETISS_BINARY_DIR}/include/jit/tcc)
     set(TinyCC_LIBNAME ${CMAKE_STATIC_LIBRARY_PREFIX}tcc${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(TinyCC_STD_LIBNAME ${CMAKE_STATIC_LIBRARY_PREFIX}tcc1${CMAKE_STATIC_LIBRARY_SUFFIX})
 

src/ETISS.cpp

@@ -48,6 +48,10 @@
 #include <boost/algorithm/string.hpp>
 
 #include "SimpleIni.h"
+// SimpleIni includes windows.h which defines NOERROR, clashing with our ReturnCode.
+#ifdef NOERROR
+#undef NOERROR
+#endif
 
 #if ETISS_USE_DLSYM
 #include <dlfcn.h>

src/bare_etiss_processor/CMakeLists.txt

@@ -50,20 +50,19 @@ configure_file(
     @ONLY
 )
 
-set(ETISS_DIR ${CMAKE_BINARY_DIR})
 configure_file(
     run_helper.sh.in
-    "${CMAKE_BINARY_DIR}/bin/run_helper.sh"
+    "${ETISS_BINARY_DIR}/bin/run_helper.sh"
     @ONLY
 )
 configure_file(
     base.ini
-    "${CMAKE_BINARY_DIR}/examples/base.ini"
+    "${ETISS_BINARY_DIR}/examples/base.ini"
     COPYONLY
 )
 set_target_properties( bare_etiss_processor
     PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+    RUNTIME_OUTPUT_DIRECTORY "${ETISS_BINARY_DIR}/bin"
  )
 
 install(TARGETS bare_etiss_processor DESTINATION bin)

src/jitlibs/CSRCounters/CMakeLists.txt

@@ -12,8 +12,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC ETISS)
 
 add_custom_command(
   TARGET ${PROJECT_NAME} POST_BUILD VERBATIM
-  COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/include/jit/etiss/jit/
-  COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:${PROJECT_NAME}>" ${CMAKE_BINARY_DIR}/include/jit/etiss/jit/
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${ETISS_BINARY_DIR}/include/jit/etiss/jit/
+  COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:${PROJECT_NAME}>" ${ETISS_BINARY_DIR}/include/jit/etiss/jit/
 )
 
 INSTALL(FILES

src/jitlibs/resources/CMakeLists.txt

@@ -11,8 +11,8 @@ ADD_LIBRARY(${PROJECT_NAME} SHARED
 
 add_custom_command(
   TARGET ${PROJECT_NAME} POST_BUILD VERBATIM
-  COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/include/jit/etiss/jit/
-  COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:${PROJECT_NAME}>" ${CMAKE_BINARY_DIR}/include/jit/etiss/jit/
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${ETISS_BINARY_DIR}/include/jit/etiss/jit/
+  COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:${PROJECT_NAME}>" ${ETISS_BINARY_DIR}/include/jit/etiss/jit/
 )
 
 

src/jitlibs/softfloat/CMakeLists.txt

@@ -403,8 +403,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC ${BPROJECT_NAME})
 
 add_custom_command(
   TARGET ${PROJECT_NAME} POST_BUILD VERBATIM
-  COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/include/jit/etiss/jit/
-  COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:${PROJECT_NAME}>" ${CMAKE_BINARY_DIR}/include/jit/etiss/jit/
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${ETISS_BINARY_DIR}/include/jit/etiss/jit/
+  COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:${PROJECT_NAME}>" ${ETISS_BINARY_DIR}/include/jit/etiss/jit/
 )
 
 ENDIF()