Compare commits

..

No commits in common. "d388cd2cec53fef7068e3760dc2f782f499f3192" and "2626fdcdd4f39e159f3afafc62f0e261152e954c" have entirely different histories.

1 changed files with 7 additions and 19 deletions

View File

@ -33,20 +33,15 @@ if(NOT DEFINED YYTHUNKS_TARGET_OS)
set(YYTHUNKS_TARGET_OS "Vista" CACHE STRING "Supported values: Vista, WinXP" FORCE) set(YYTHUNKS_TARGET_OS "Vista" CACHE STRING "Supported values: Vista, WinXP" FORCE)
endif() endif()
set(__yy_thunks_dir "") set(__yy_thunks_dir)
if(DEFINED ENV{YYTHUNKS_INSTALL_DIR}) if(DEFINED ENV{YYTHUNKS_INSTALL_DIR} AND EXISTS "$ENV{YYTHUNKS_INSTALL_DIR}")
set(__env "$ENV{YYTHUNKS_INSTALL_DIR}") set(__yy_thunks_dir "$ENV{YYTHUNKS_INSTALL_DIR}")
if(NOT "x${__env}" STREQUAL "x" AND EXISTS "${__env}") else()
set(__yy_thunks_dir "${__env}") set(__yy_thunks_reg)
endif()
endif()
if("x${__yy_thunks_dir}" STREQUAL "x")
set(__yy_thunks_reg "")
cmake_host_system_information(RESULT __yy_thunks_reg cmake_host_system_information(RESULT __yy_thunks_reg
QUERY WINDOWS_REGISTRY "HKCU/Code/YY-Thunks" QUERY WINDOWS_REGISTRY "HKCU/Code/YY-Thunks"
VALUE "Root") VALUE "Root")
if(NOT "x${__yy_thunks_reg}" STREQUAL "x" AND EXISTS "${__yy_thunks_reg}") if(__yy_thunks_reg AND EXISTS "${__yy_thunks_reg}")
set(__yy_thunks_dir "${__yy_thunks_reg}") set(__yy_thunks_dir "${__yy_thunks_reg}")
elseif(EXISTS "${CMAKE_CURRENT_LIST_DIR}/YY-Thunks") elseif(EXISTS "${CMAKE_CURRENT_LIST_DIR}/YY-Thunks")
set(__yy_thunks_dir "${CMAKE_CURRENT_LIST_DIR}/YY-Thunks") set(__yy_thunks_dir "${CMAKE_CURRENT_LIST_DIR}/YY-Thunks")
@ -61,23 +56,16 @@ if("x${__yy_thunks_dir}" STREQUAL "x")
endif() endif()
endif() endif()
if(NOT "x${__yy_thunks_dir}" STREQUAL "x") if(__yy_thunks_dir AND EXISTS "${__yy_thunks_dir}")
cmake_path(NORMAL_PATH __yy_thunks_dir OUTPUT_VARIABLE __yy_thunks_dir)
endif()
if(NOT "x${__yy_thunks_dir}" STREQUAL "x" AND EXISTS "${__yy_thunks_dir}")
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(__yy_thunks_arch x64) set(__yy_thunks_arch x64)
else() else()
set(__yy_thunks_arch x86) set(__yy_thunks_arch x86)
endif() endif()
set(__yy_thunks_obj "${__yy_thunks_dir}/objs/${__yy_thunks_arch}/YY_Thunks_for_${YYTHUNKS_TARGET_OS}.obj") set(__yy_thunks_obj "${__yy_thunks_dir}/objs/${__yy_thunks_arch}/YY_Thunks_for_${YYTHUNKS_TARGET_OS}.obj")
cmake_path(NORMAL_PATH __yy_thunks_obj OUTPUT_VARIABLE __yy_thunks_obj)
if(EXISTS "${__yy_thunks_obj}") if(EXISTS "${__yy_thunks_obj}")
set(YYTHUNKS_FOUND TRUE CACHE BOOL "" FORCE) set(YYTHUNKS_FOUND TRUE CACHE BOOL "" FORCE)
set(YYTHUNKS_INSTALL_DIR "${__yy_thunks_dir}" CACHE STRING "" FORCE) set(YYTHUNKS_INSTALL_DIR "${__yy_thunks_dir}" CACHE STRING "" FORCE)
set(YYTHUNKS_ARCH "${__yy_thunks_arch}" CACHE STRING "" FORCE)
set(YYTHUNKS_OBJ_FILE "YY_Thunks_for_${YYTHUNKS_TARGET_OS}.obj" CACHE STRING "" FORCE)
set(YYTHUNKS_OBJ_PATH "${__yy_thunks_obj}" CACHE STRING "" FORCE) set(YYTHUNKS_OBJ_PATH "${__yy_thunks_obj}" CACHE STRING "" FORCE)
add_link_options("${__yy_thunks_obj}") add_link_options("${__yy_thunks_obj}")
message("###################################################################################################") message("###################################################################################################")