diff --git a/cmake/Modules/FindCEF.cmake b/cmake/Modules/FindCEF.cmake index 9b961a92b..c18b5094b 100644 --- a/cmake/Modules/FindCEF.cmake +++ b/cmake/Modules/FindCEF.cmake @@ -1,7 +1,9 @@ include(FindPackageHandleStandardArgs) -set_property(CACHE CEF_ROOT_DIR PROPERTY HELPSTRING - "Path to CEF distributed build") +set(CEF_ROOT_DIR + "" + CACHE PATH "Path to CEF distributed build") + if(NOT DEFINED CEF_ROOT_DIR OR CEF_ROOT_DIR STREQUAL "") message( FATAL_ERROR @@ -10,58 +12,58 @@ if(NOT DEFINED CEF_ROOT_DIR OR CEF_ROOT_DIR STREQUAL "") ) endif() -find_path(CEF_INCLUDE_DIR "include/cef_version.h" HINTS "${CEF_ROOT_DIR}") +find_path(CEF_INCLUDE_DIR "include/cef_version.h" HINTS ${CEF_ROOT_DIR}) if(OS_MACOS) find_library( CEF_LIBRARY NAMES cef libcef cef.lib libcef.o "Chromium Embedded Framework" NO_DEFAULT_PATH - PATHS "${CEF_ROOT_DIR}" "${CEF_ROOT_DIR}/Release") + PATHS ${CEF_ROOT_DIR} ${CEF_ROOT_DIR}/Release) find_library( CEFWRAPPER_LIBRARY NAMES cef_dll_wrapper libcef_dll_wrapper NO_DEFAULT_PATH - PATHS "${CEF_ROOT_DIR}/build/libcef_dll/Release" - "${CEF_ROOT_DIR}/build/libcef_dll_wrapper/Release" - "${CEF_ROOT_DIR}/build/libcef_dll" - "${CEF_ROOT_DIR}/build/libcef_dll_wrapper") + PATHS ${CEF_ROOT_DIR}/build/libcef_dll/Release + ${CEF_ROOT_DIR}/build/libcef_dll_wrapper/Release + ${CEF_ROOT_DIR}/build/libcef_dll + ${CEF_ROOT_DIR}/build/libcef_dll_wrapper) elseif(OS_POSIX) find_library( CEF_LIBRARY NAMES libcef.so "Chromium Embedded Framework" NO_DEFAULT_PATH - PATHS "${CEF_ROOT_DIR}" "${CEF_ROOT_DIR}/Release") + PATHS ${CEF_ROOT_DIR} ${CEF_ROOT_DIR}/Release) find_library( CEFWRAPPER_LIBRARY NAMES libcef_dll_wrapper.a NO_DEFAULT_PATH - PATHS "${CEF_ROOT_DIR}/build/libcef_dll_wrapper" - "${CEF_ROOT_DIR}/libcef_dll_wrapper") + PATHS ${CEF_ROOT_DIR}/build/libcef_dll_wrapper + ${CEF_ROOT_DIR}/libcef_dll_wrapper) else() find_library( CEF_LIBRARY NAMES cef libcef cef.lib libcef.o "Chromium Embedded Framework" - PATHS "${CEF_ROOT_DIR}" "${CEF_ROOT_DIR}/Release") + PATHS ${CEF_ROOT_DIR} ${CEF_ROOT_DIR}/Release) find_library( CEFWRAPPER_LIBRARY NAMES cef_dll_wrapper libcef_dll_wrapper - PATHS "${CEF_ROOT_DIR}/build/libcef_dll/Release" - "${CEF_ROOT_DIR}/build/libcef_dll_wrapper/Release" - "${CEF_ROOT_DIR}/build/libcef_dll" - "${CEF_ROOT_DIR}/build/libcef_dll_wrapper") + PATHS ${CEF_ROOT_DIR}/build/libcef_dll/Release + ${CEF_ROOT_DIR}/build/libcef_dll_wrapper/Release + ${CEF_ROOT_DIR}/build/libcef_dll + ${CEF_ROOT_DIR}/build/libcef_dll_wrapper) if(OS_WINDOWS) find_library( CEFWRAPPER_LIBRARY_DEBUG NAMES cef_dll_wrapper libcef_dll_wrapper - PATHS "${CEF_ROOT_DIR}/build/libcef_dll/Debug" - "${CEF_ROOT_DIR}/build/libcef_dll_wrapper/Debug") + PATHS ${CEF_ROOT_DIR}/build/libcef_dll/Debug + ${CEF_ROOT_DIR}/build/libcef_dll_wrapper/Debug) endif() endif()