Changeset 218888 in webkit

Timestamp:

Jun 28, 2017 1:02:07 PM (7 years ago)

Author:

Konstantin Tokarev

Message:

[cmake] Improve configuration tests for librt and libatomic
​https://bugs.webkit.org/show_bug.cgi?id=173921

Reviewed by Michael Catanzaro.

1. Both tests are converted to use specialized CMake modules
2. Both libraries are now linked only if they are really needed and usable by compiler
3. librt is no more required to be detected by find_library(), which may fail in case of cross-compilation
4. libatomic test moved to port-independent CMakeLists.txt

• CMakeLists.txt:
• PlatformGTK.cmake:

Location:

trunk/Source/WebKit2

Files:

• CMakeLists.txt (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• PlatformGTK.cmake (modified) (1 diff)

trunk/Source/WebKit2/CMakeLists.txt

@@ +1 @@
+include(CheckCXXSourceCompiles)
+include(CheckFunctionExists)
+
 set_property(DIRECTORY . PROPERTY FOLDER "WebKit2")
 
@@ -714 +717 @@
 endif ()
 
-# librt is needed for shm_open on Linux.
-find_library(LIBRT_LIBRARIES NAMES rt)
-mark_as_advanced(LIBRT_LIBRARIES)
-if (LIBRT_LIBRARIES)
-    list(APPEND WebKit2_LIBRARIES ${LIBRT_LIBRARIES})
+if (COMPILER_IS_GCC_OR_CLANG)
+    set(ATOMIC_TEST_SOURCE
+    "
+        #include <atomic>
+        int main() { std::atomic<int64_t> i(0); i++; return 0; }
+    "
+    )
+    check_cxx_source_compiles("${ATOMIC_TEST_SOURCE}" ATOMIC_INT64_IS_BUILTIN)
+    if (NOT ATOMIC_INT64_IS_BUILTIN)
+        set(CMAKE_REQUIRED_LIBRARIES atomic)
+        check_cxx_source_compiles("${ATOMIC_TEST_SOURCE}" ATOMIC_INT64_REQUIRES_LIBATOMIC)
+        if (ATOMIC_INT64_REQUIRES_LIBATOMIC)
+            list(APPEND WebKit2_LIBRARIES atomic)
+        endif ()
+        unset(CMAKE_REQUIRED_LIBRARIES)
+    endif ()
+endif ()
+
+if (UNIX)
+    check_function_exists(shm_open SHM_OPEN_EXISTS)
+    if (NOT SHM_OPEN_EXISTS)
+        set(CMAKE_REQUIRED_LIBRARIES rt)
+        check_function_exists(shm_open SHM_OPEN_REQUIRES_LIBRT)
+        if (SHM_OPEN_REQUIRES_LIBRT)
+            list(APPEND WebKit2_LIBRARIES rt)
+        endif ()
+    endif ()
 endif ()
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-06-28  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [cmake] Improve configuration tests for librt and libatomic
+        https://bugs.webkit.org/show_bug.cgi?id=173921
+
+        Reviewed by Michael Catanzaro.
+
+        1. Both tests are converted to use specialized CMake modules
+        2. Both libraries are now linked only if they are really needed and usable
+           by compiler
+        3. librt is no more required to be detected by find_library(), which may fail
+           in case of cross-compilation
+        4. libatomic test moved to port-independent CMakeLists.txt
+
+        * CMakeLists.txt:
+        * PlatformGTK.cmake:
+
 2017-06-28  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit2/PlatformGTK.cmake

@@ -845 +845 @@
 )
 
-file(WRITE ${CMAKE_BINARY_DIR}/test_atomic.cpp
-     "#include <atomic>\n"
-     "int main() { std::atomic<int64_t> i(0); i++; return 0; }\n")
-try_compile(ATOMIC_BUILD_SUCCEEDED ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/test_atomic.cpp)
-if (NOT ATOMIC_BUILD_SUCCEEDED)
-    list(APPEND WebKit2_LIBRARIES atomic)
-endif ()
-file(REMOVE ${CMAKE_BINARY_DIR}/test_atomic.cpp)
-
 set(SharedWebKit2Libraries
     ${WebKit2_LIBRARIES}