Title: [215326] trunk
- Revision
- 215326
- Author
- commit-qu...@webkit.org
- Date
- 2017-04-13 10:54:20 -0700 (Thu, 13 Apr 2017)
Log Message
[WinCairo] Assign WEBKIT_LIBRARIES_DIR to CMAKE_PREFIX_PATH
https://bugs.webkit.org/show_bug.cgi?id=170797
Patch by Don Olmstead <don.olmst...@am.sony.com> on 2017-04-13
Reviewed by Alex Christensen.
* Source/cmake/FindCairo.cmake:
* Source/cmake/OptionsWin.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (215325 => 215326)
--- trunk/ChangeLog 2017-04-13 17:39:03 UTC (rev 215325)
+++ trunk/ChangeLog 2017-04-13 17:54:20 UTC (rev 215326)
@@ -1,3 +1,13 @@
+2017-04-13 Don Olmstead <don.olmst...@am.sony.com>
+
+ [WinCairo] Assign WEBKIT_LIBRARIES_DIR to CMAKE_PREFIX_PATH
+ https://bugs.webkit.org/show_bug.cgi?id=170797
+
+ Reviewed by Alex Christensen.
+
+ * Source/cmake/FindCairo.cmake:
+ * Source/cmake/OptionsWin.cmake:
+
2017-04-11 Zan Dobersek <zdober...@igalia.com>
[CMake] OpenWebRTC libraries path isn't properly deduced
Modified: trunk/Source/cmake/FindCairo.cmake (215325 => 215326)
--- trunk/Source/cmake/FindCairo.cmake 2017-04-13 17:39:03 UTC (rev 215325)
+++ trunk/Source/cmake/FindCairo.cmake 2017-04-13 17:54:20 UTC (rev 215326)
@@ -35,7 +35,6 @@
NAMES cairo.h
HINTS ${PC_CAIRO_INCLUDEDIR}
${PC_CAIRO_INCLUDE_DIRS}
- ${WEBKIT_LIBRARIES_INCLUDE_DIR}/cairo
PATH_SUFFIXES cairo
)
@@ -43,7 +42,6 @@
NAMES cairo
HINTS ${PC_CAIRO_LIBDIR}
${PC_CAIRO_LIBRARY_DIRS}
- ${WEBKIT_LIBRARIES_LINK_DIR}
)
if (CAIRO_INCLUDE_DIRS)
Modified: trunk/Source/cmake/OptionsWin.cmake (215325 => 215326)
--- trunk/Source/cmake/OptionsWin.cmake 2017-04-13 17:39:03 UTC (rev 215325)
+++ trunk/Source/cmake/OptionsWin.cmake 2017-04-13 17:54:20 UTC (rev 215326)
@@ -87,10 +87,14 @@
endif ()
endif ()
+set(CMAKE_PREFIX_PATH ${WEBKIT_LIBRARIES_DIR})
+
set(WEBKIT_LIBRARIES_INCLUDE_DIR "${WEBKIT_LIBRARIES_DIR}/include")
include_directories("${CMAKE_BINARY_DIR}/DerivedSources/ForwardingHeaders" "${CMAKE_BINARY_DIR}/DerivedSources" "${WEBKIT_LIBRARIES_INCLUDE_DIR}")
if (${MSVC_CXX_ARCHITECTURE_ID} STREQUAL "X86")
+ set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS ON)
+ set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF)
set(WEBKIT_LIBRARIES_LINK_DIR "${WEBKIT_LIBRARIES_DIR}/lib32")
# FIXME: Remove ${WEBKIT_LIBRARIES_LINK_DIR} when find_library is used for everything
link_directories("${CMAKE_BINARY_DIR}/lib32" "${WEBKIT_LIBRARIES_LINK_DIR}")
@@ -98,6 +102,8 @@
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib32)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin32)
else ()
+ set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS OFF)
+ set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
set(WEBKIT_LIBRARIES_LINK_DIR "${WEBKIT_LIBRARIES_DIR}/lib64")
# FIXME: Remove ${WEBKIT_LIBRARIES_LINK_DIR} when find_library is used for everything
link_directories("${CMAKE_BINARY_DIR}/lib64" "${WEBKIT_LIBRARIES_LINK_DIR}")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
