Fix cmake

JonathanSalwan · Jul 23, 2024 · 7d19b69 · 7d19b69
1 parent ea3cb55
commit 7d19b69
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/vcpkg.yml b/.github/workflows/vcpkg.yml
@@ -64,7 +64,7 @@ jobs:
     - name: Configure (Windows)
       if: ${{ matrix.platform == 'windows' }}
       run: |
-        cmake --preset=${{ matrix.cmake-preset }} -DBUILD_SHARED_LIBS:BOOL=ON -DCS_VERSION_MAJOR:STRING=5 -DCOMPILE_RISCV:BOOL=ON -DVCPKG_OVERLAY_TRIPLETS:PATH=${{ github.workspace }}\vcpkg\triplets -DVCPKG_TARGET_TRIPLET:STRING=${{ matrix.vcpkg-triplet }}
+        cmake --preset=${{ matrix.cmake-preset }} -DBUILD_SHARED_LIBS:BOOL=ON -DCS_VERSION_MAJOR:STRING=5 -DVCPKG_OVERLAY_TRIPLETS:PATH=${{ github.workspace }}\vcpkg\triplets -DVCPKG_TARGET_TRIPLET:STRING=${{ matrix.vcpkg-triplet }}
       env:
         # capstone 4.0.2 does not produce a CMake Config, hence the need to point directly to include directories and libraries
         CAPSTONE_INCLUDE_DIRS: ${{ github.workspace }}/build/${{ matrix.cmake-preset }}/vcpkg_installed/${{ matrix.vcpkg-triplet }}/include
@@ -76,7 +76,7 @@ jobs:
       if: ${{ matrix.platform != 'windows' }}
       run: |
         python -m pip install importlib-resources
-        cmake --preset=${{ matrix.cmake-preset }} -DBUILD_SHARED_LIBS:BOOL=ON -DCS_VERSION_MAJOR:STRING=5 -DCOMPILE_RISCV:BOOL=ON -DVCPKG_OVERLAY_TRIPLETS:PATH=${{ github.workspace }}/vcpkg/triplets -DVCPKG_TARGET_TRIPLET:STRING=${{ matrix.vcpkg-triplet }}
+        cmake --preset=${{ matrix.cmake-preset }} -DBUILD_SHARED_LIBS:BOOL=ON -DCS_VERSION_MAJOR:STRING=5 -DVCPKG_OVERLAY_TRIPLETS:PATH=${{ github.workspace }}/vcpkg/triplets -DVCPKG_TARGET_TRIPLET:STRING=${{ matrix.vcpkg-triplet }}
       env:
         # capstone 4.0.2 does not produce a CMake Config, hence the need to point directly to include directories and libraries
         CAPSTONE_INCLUDE_DIRS: ${{ github.workspace }}/build/${{ matrix.cmake-preset }}/vcpkg_installed/${{ matrix.vcpkg-triplet }}/include
@@ -86,7 +86,7 @@ jobs:
 
     - name: Build
       run: |
-        cmake --build --preset build-${{ matrix.cmake-preset }} --config Release -DCS_VERSION_MAJOR:STRING=5 -DCOMPILE_RISCV:BOOL=ON
+        cmake --build --preset build-${{ matrix.cmake-preset }} --config Release -DCS_VERSION_MAJOR:STRING=5
 
     - name: Test
       # Test disabled on Windows `pip install lief` fails as there is no ready to use .whl and compilation fails
@@ -98,7 +98,7 @@ jobs:
 
     - name: Install
       run: |
-        cmake --build --preset build-${{ matrix.cmake-preset }} --config Release --target install -DCOMPILE_RISCV:BOOL=ON
+        cmake --build --preset build-${{ matrix.cmake-preset }} --config Release --target install -DCS_VERSION_MAJOR:STRING=5
 
     - name: Upload
       uses: actions/upload-artifact@v3

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -195,7 +195,6 @@ message(STATUS "Compiling with Capstone")
 find_package(CAPSTONE 5 REQUIRED)
 message(STATUS "CAPSTONE version: ${CAPSTONE_VERSION}")
 if(${CS_VERSION_MAJOR} GREATER_EQUAL 5)
-    set(COMPILE_RISCV ON)
     add_definitions(-DCOMPILE_RISCV)
 endif()
 if(TARGET capstone::capstone)

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -36,7 +36,7 @@ add_custom_target(gen_rv32_doc_from_spec
     DEPENDS ${TRITON_ROOT}/src/libtriton/includes/triton/riscv32.spec
 )
 
-if(COMPILE_RISCV)
+if(${CS_VERSION_MAJOR} GREATER_EQUAL 5)
     add_custom_target(doc
         COMMAND doxygen ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
         DEPENDS gen_x86_doc_from_spec
@@ -55,7 +55,7 @@ else()
 endif()
 
 if(PYTHON_BINDINGS_AUTOCOMPLETE)
-    if(COMPILE_RISCV)
+    if(${CS_VERSION_MAJOR} GREATER_EQUAL 5)
         add_custom_target(python_autocomplete
         COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/autocomplete/generate_autocomplete.py "--basedir" "${CMAKE_CURRENT_BINARY_DIR}" "$<$<BOOL:${BITWUZLA_INTERFACE}>:--bitwuzla>" "$<$<BOOL:${Z3_INTERFACE}>:--z3>"
         DEPENDS gen_x86_doc_from_spec

diff --git a/src/libtriton/CMakeLists.txt b/src/libtriton/CMakeLists.txt
@@ -148,7 +148,7 @@ set(LIBTRITON_HEADER_FILES
 )
 
 # Add riscv source and header files
-if(${COMPILE_RISCV})
+if(${CS_VERSION_MAJOR} GREATER_EQUAL 5)
     list(APPEND LIBTRITON_SOURCE_FILES
         arch/riscv/riscv32Cpu.cpp
         arch/riscv/riscv64Cpu.cpp

diff --git a/src/testers/CMakeLists.txt b/src/testers/CMakeLists.txt
@@ -5,7 +5,7 @@ if((${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin
 
     add_test(NAME UnicornAArch64Semantics  COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/aarch64/unicorn_test_aarch64.py)
     add_test(NAME UnicornX86Semantics      COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/x86/unicorn_test_x86.py)
-    if(${COMPILE_RISCV})
+    if(${CS_VERSION_MAJOR} GREATER_EQUAL 5)
         add_test(NAME UnicornRiscv64Semantics  COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/riscv/unicorn_test_riscv64.py)
         add_test(NAME UnicornRiscv32Semantics  COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/riscv/unicorn_test_riscv32.py)
     endif()
@@ -85,7 +85,7 @@ if((${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin
         UnicornARM32Semantics35
         PROPERTY ENVIRONMENT "PYTHONPATH=$<TARGET_FILE_DIR:triton>"
     )
-    if(${COMPILE_RISCV})
+    if(${CS_VERSION_MAJOR} GREATER_EQUAL 5)
         set_property(TEST
             UnicornRiscv64Semantics
             UnicornRiscv32Semantics