Title: [270751] trunk
- Revision
- 270751
- Author
- [email protected]
- Date
- 2020-12-13 13:49:06 -0800 (Sun, 13 Dec 2020)
Log Message
[CMake] Version of LibPSL not reported
https://bugs.webkit.org/show_bug.cgi?id=219837
Reviewed by Adrian Perez de Castro.
When determining the version of LibPSL from the header file LIBPSL_VERSION was set
but the VERSION_VAR reported was LibPSL_VERSION. Consistently use LibPSL_VERSION
within the file to prevent this.
Additionally LibPSL_LIBRARY not LibPSL_LIBRARIES should be marked_as_advanced.
* Source/cmake/FindLibPSL.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (270750 => 270751)
--- trunk/ChangeLog 2020-12-13 17:55:09 UTC (rev 270750)
+++ trunk/ChangeLog 2020-12-13 21:49:06 UTC (rev 270751)
@@ -1,3 +1,18 @@
+2020-12-13 Don Olmstead <[email protected]>
+
+ [CMake] Version of LibPSL not reported
+ https://bugs.webkit.org/show_bug.cgi?id=219837
+
+ Reviewed by Adrian Perez de Castro.
+
+ When determining the version of LibPSL from the header file LIBPSL_VERSION was set
+ but the VERSION_VAR reported was LibPSL_VERSION. Consistently use LibPSL_VERSION
+ within the file to prevent this.
+
+ Additionally LibPSL_LIBRARY not LibPSL_LIBRARIES should be marked_as_advanced.
+
+ * Source/cmake/FindLibPSL.cmake:
+
2020-12-11 Don Olmstead <[email protected]>
[CMake] Determine correct visibility for linked frameworks
Modified: trunk/Source/cmake/FindLibPSL.cmake (270750 => 270751)
--- trunk/Source/cmake/FindLibPSL.cmake 2020-12-13 17:55:09 UTC (rev 270750)
+++ trunk/Source/cmake/FindLibPSL.cmake 2020-12-13 21:49:06 UTC (rev 270751)
@@ -70,18 +70,18 @@
if (LibPSL_INCLUDE_DIR AND NOT LibPSL_VERSION)
if (EXISTS "${LibPSL_INCLUDE_DIR}/libpsl.h")
- file(READ "${LibPSL_INCLUDE_DIR}/libpsl.h" LIBPSL_VERSION_CONTENT)
+ file(READ "${LibPSL_INCLUDE_DIR}/libpsl.h" LibPSL_VERSION_CONTENT)
- string(REGEX MATCH "#define +PSL_VERSION_MAJOR +([0-9]+)" _dummy "${LIBPSL_VERSION_CONTENT}")
- set(LIBPSL_VERSION_MAJOR "${CMAKE_MATCH_1}")
+ string(REGEX MATCH "#define +PSL_VERSION_MAJOR +([0-9]+)" _dummy "${LibPSL_VERSION_CONTENT}")
+ set(LibPSL_VERSION_MAJOR "${CMAKE_MATCH_1}")
- string(REGEX MATCH "#define +PSL_VERSION_MINOR +([0-9]+)" _dummy "${LIBPSL_VERSION_CONTENT}")
- set(LIBPSL_VERSION_MINOR "${CMAKE_MATCH_1}")
+ string(REGEX MATCH "#define +PSL_VERSION_MINOR +([0-9]+)" _dummy "${LibPSL_VERSION_CONTENT}")
+ set(LibPSL_VERSION_MINOR "${CMAKE_MATCH_1}")
- string(REGEX MATCH "#define +PSL_VERSION_PATCH +([0-9]+)" _dummy "${LIBPSL_VERSION_CONTENT}")
- set(LIBPSL_VERSION_PATCH "${CMAKE_MATCH_1}")
+ string(REGEX MATCH "#define +PSL_VERSION_PATCH +([0-9]+)" _dummy "${LibPSL_VERSION_CONTENT}")
+ set(LibPSL_VERSION_PATCH "${CMAKE_MATCH_1}")
- set(LIBPSL_VERSION "${LIBPSL_VERSION_MAJOR}.${LIBPSL_VERSION_MINOR}.${LIBPSL_VERSION_PATCH}")
+ set(LibPSL_VERSION "${LibPSL_VERSION_MAJOR}.${LibPSL_VERSION_MINOR}.${LibPSL_VERSION_PATCH}")
endif ()
endif ()
@@ -101,7 +101,7 @@
)
endif ()
-mark_as_advanced(LibPSL_INCLUDE_DIR LIBPSL_LIBRARIES)
+mark_as_advanced(LibPSL_INCLUDE_DIR LibPSL_LIBRARY)
if (LibPSL_FOUND)
set(LibPSL_LIBRARIES ${LibPSL_LIBRARY})
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
