New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qt static build - installs missing static libraries and adds missing dependancies in pkgconfig and pri files #277

Closed
wants to merge 23 commits into
base: qtwebkit-stable
from

Conversation

Projects
None yet
4 participants
@matteoceraico

matteoceraico commented Aug 10, 2016

Installs:

  • libbmalloc
  • libWTF
  • libJavaScriptCore
  • libWebCore

Adds missing dependancies in:

  • Qt5WebKit.pc
  • qt_lib_webkit.pri

Cerri added some commits Jul 15, 2016

Cerri Cerri
Fix compiling process on osx by using static Qt libraries
New cmake arguments added:
- DISABLE_TESTS, disables all test
- QT_STATIC_BUILD, defines that qt is compiled as a static lib

Provided ability to exclude QT features, you need to add the parameters
(in accordance with QT) as a cmake argument (e.g.:
-DQT_NO_GRAPHICSVIEW=ON)
Cerri Cerri
Removed QT_STATIC_BUILD cmakearg
Now QT_STATIC_BUILD is populated dynamically
Cerri Cerri
Removed unwanted features
We’re able to manage it in another way
Cerri Cerri
Removed DISABLE_TESTS cmakearg
DISABLE_TESTS has been substituted with ENABLE_TEST_SUPPORT (that was
already implemented)
Cerri Cerri
Improvements
Moved declaration of QT_STATIC_BUILD
Used a better check for the tests related to the JavaScriptCore (we’re
looking for ENABLE_API_TESTS instead of ENABLE_TEST_SUPPORT)
Cerri Cerri
Provides the ability to define SQLITE3SRCDIR
The sources of SQLITE3 will be compiled instead of to use the system
libraries.
@annulen

This comment has been minimized.

Show comment
Hide comment
@annulen

annulen Jul 18, 2016

Owner

Leave it as is, ${SQLITE_INCLUDE_DIR} and ${SQLITE_LIBRARIES} will be just empty in worst case

Owner

annulen commented on Source/WebCore/PlatformQt.cmake in 38014df Jul 18, 2016

Leave it as is, ${SQLITE_INCLUDE_DIR} and ${SQLITE_LIBRARIES} will be just empty in worst case

@annulen

This comment has been minimized.

Show comment
Hide comment
@annulen

annulen Jul 18, 2016

Owner

SQLITE3SRCDIR was environment variable, I think we should keep it as such. $ENV{SQLITE3SRCDIR} should work

Owner

annulen commented on Source/WebCore/PlatformQt.cmake in 38014df Jul 18, 2016

SQLITE3SRCDIR was environment variable, I think we should keep it as such. $ENV{SQLITE3SRCDIR} should work

@annulen

This comment has been minimized.

Show comment
Hide comment
@annulen

annulen Jul 18, 2016

Owner

Set ${SQLITE_INCLUDE_DIR} instead

Owner

annulen commented on Source/WebCore/PlatformQt.cmake in 38014df Jul 18, 2016

Set ${SQLITE_INCLUDE_DIR} instead

@annulen

This comment has been minimized.

Show comment
Hide comment
@annulen

annulen Jul 18, 2016

Owner

I think these defines should affect only sqlite3.c - set them via use source file property on this file only, check Makefile to see if they took effect

Owner

annulen commented on Source/WebCore/PlatformQt.cmake in 38014df Jul 18, 2016

I think these defines should affect only sqlite3.c - set them via use source file property on this file only, check Makefile to see if they took effect

This comment has been minimized.

Show comment
Hide comment
@annulen

annulen Jul 18, 2016

Owner

IIRC there was a macro to add properties to one file

Owner

annulen replied Jul 18, 2016

IIRC there was a macro to add properties to one file

iamsergio and others added some commits Feb 8, 2014

@@ -1312,10 +1312,17 @@ add_subdirectory(shell)
WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
WEBKIT_FRAMEWORK(JavaScriptCore)
if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED")
if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED" OR QT_STATIC_BUILD)

This comment has been minimized.

@Vitallium

Vitallium Aug 10, 2016

Collaborator

On Windows we always build JavaScriptCore as a static library. If this necessary for other systems (Linux and macOS), then it should be wrapped.

@Vitallium

Vitallium Aug 10, 2016

Collaborator

On Windows we always build JavaScriptCore as a static library. If this necessary for other systems (Linux and macOS), then it should be wrapped.

if (APPLE)
list(APPEND EXTRA_LIBS_NAMES "icucore")
else ()
list(APPEND EXTRA_LIBS_NAMES "icu")

This comment has been minimized.

@Vitallium

Vitallium Aug 10, 2016

Collaborator

Same here.

@Vitallium

Vitallium Aug 10, 2016

Collaborator

Same here.

@annulen

This comment has been minimized.

Show comment
Hide comment
@annulen

annulen Sep 28, 2016

Owner

Superceded by #323

Owner

annulen commented Sep 28, 2016

Superceded by #323

@annulen annulen closed this Sep 28, 2016

@matteoceraico matteoceraico deleted the matteoceraico:qtwebkit-stable branch Oct 11, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment