Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion cmake/platform.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,13 @@ endif()

# Construct library directory (always EA64)
set(IDA_EA_SIZE "64")
set(IDA_LIB_SUFFIX "${IDA_ARCH}_${IDA_PLATFORM_NAME}_${IDA_COMPILER}_64")
# Try without compiler name first (new naming), fall back to with compiler (old naming)
set(IDA_LIB_SUFFIX "${IDA_ARCH}_${IDA_PLATFORM_NAME}_64")
set(IDA_LIB_DIR "${IDASDK}/lib/${IDA_LIB_SUFFIX}")
if(NOT EXISTS "${IDA_LIB_DIR}")
set(IDA_LIB_SUFFIX "${IDA_ARCH}_${IDA_PLATFORM_NAME}_${IDA_COMPILER}_64")
set(IDA_LIB_DIR "${IDASDK}/lib/${IDA_LIB_SUFFIX}")
endif()

# Platform-specific library names (using consistent platform detection)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
Expand Down
5 changes: 4 additions & 1 deletion idasdkConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ if(IDA_UNIVERSAL_BINARY)
message(FATAL_ERROR "Unsupported architecture for universal binary: ${_arch}")
endif()

set(_lib_dir "${IDASDK}/lib/${_ida_arch}_${IDA_PLATFORM_NAME}_${IDA_COMPILER}_64")
set(_lib_dir "${IDASDK}/lib/${_ida_arch}_${IDA_PLATFORM_NAME}_64")
if(NOT EXISTS "${_lib_dir}")
set(_lib_dir "${IDASDK}/lib/${_ida_arch}_${IDA_PLATFORM_NAME}_${IDA_COMPILER}_64")
endif()
set(_lib_path "${_lib_dir}/lib${_lib_basename}.dylib")

if(NOT EXISTS "${_lib_path}")
Expand Down
Loading