Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: Fixed cmake not using default settings on Windows

This commit is contained in:
WerWolv 2023-08-06 01:52:23 +02:00
parent f2cfc70eca
commit fae8f0a8d5
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmake/build_helpers.cmake
View File

@ -291,44 +291,34 @@ macro(configureCMake)
find_program(RANLIB_LLVMLIBS_PATH llvm-ranlib) find_program(RANLIB_LLVMLIBS_PATH llvm-ranlib)
if (CCACHE_PATH) if (CCACHE_PATH)
if (NOT CMAKE_C_COMPILER_LAUNCHER AND NOT CMAKE_CXX_COMPILER_LAUNCHER) set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PATH})
set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PATH}) set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_PATH})
set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_PATH})
endif ()
else () else ()
message(WARNING "ccache not found!") message(WARNING "ccache not found!")
endif () endif ()
if (AR_LLVMLIBS_PATH) if (AR_LLVMLIBS_PATH)
if (NOT CMAKE_AR) set(CMAKE_AR ${AR_LLVMLIBS_PATH})
set(CMAKE_AR ${AR_LLVMLIBS_PATH})
endif ()
else () else ()
message(WARNING "llvm-ar not found, using default ar!") message(WARNING "llvm-ar not found, using default ar!")
endif () endif ()
if (RANLIB_LLVMLIBS_PATH) if (RANLIB_LLVMLIBS_PATH)
if (NOT CMAKE_RANLIB) set(CMAKE_RANLIB ${RANLIB_LLVMLIBS_PATH})
set(CMAKE_RANLIB ${RANLIB_LLVMLIBS_PATH})
endif ()
else () else ()
message(WARNING "llvm-ranlib not found, using default ranlib!") message(WARNING "llvm-ranlib not found, using default ranlib!")
endif () endif ()
if (LD_LLD_PATH) if (LD_LLD_PATH)
if (NOT CMAKE_LINKER) set(CMAKE_LINKER ${LD_LLD_PATH})
set(CMAKE_LINKER ${LD_LLD_PATH}) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=lld")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=lld") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=lld")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=lld")
endif ()
else () else ()
message(WARNING "lld not found, using default linker!") message(WARNING "lld not found, using default linker!")
endif () endif ()
if (NINJA_PATH) if (NINJA_PATH)
if (NOT CMAKE_GENERATOR) set(CMAKE_GENERATOR Ninja)
set(CMAKE_GENERATOR Ninja)
endif ()
else () else ()
message(WARNING "ninja not found, using default generator!") message(WARNING "ninja not found, using default generator!")
endif () endif ()

2
lib/external/yara/CMakeLists.txt vendored
View File

@ -133,6 +133,8 @@ else ()
endif () endif ()
include(GNUInstallDirs) include(GNUInstallDirs)
file(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/yara/yara.pc)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yara/yara.pc.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yara/yara.pc.in
${CMAKE_CURRENT_SOURCE_DIR}/yara/yara.pc @ONLY) ${CMAKE_CURRENT_SOURCE_DIR}/yara/yara.pc @ONLY)
set(CMAKE_STATIC_LIBRARY_PREFIX "") set(CMAKE_STATIC_LIBRARY_PREFIX "")