Bug 153778 – [CMake] Remove meaningless conditional statements in CMakeLists.txt

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Joonghun Park]

Use CMAKE_FOO_OUTPUT_DIRECTORY located in CMakeLists.txt as default value.
And remove conditional statements which has enclosed these one because they don't have meaning anymore.

[Joonghun Park]

Created attachment 270449 [details]
Patch

[Alex Christensen]

Comment on attachment 270449 [details]
Patch

This needs to be like this.
See http://trac.webkit.org/changeset/195478

[Joonghun Park]

(In reply to comment #2)
> Comment on attachment 270449 [details]
> Patch
> 
> This needs to be like this.
> See http://trac.webkit.org/changeset/195478

Hmm, doesn't those things be overwritten by OptionsWin.cmake?
Because now those things are precede to include(OptionsCommon) by https://bugs.webkit.org/show_bug.cgi?id=153373.

They don't follow the include(OptionsCommon) in order, so it seems that they don't need any conditionals there.

But if I missed something, please let me know.

[Alex Christensen]

The internal Windows build builds each directory (WTF, JavaScriptCore, WebCore, and WebKit) without the other directories where they are.  This causes problems with that setup.

[Joonghun Park]

(In reply to comment #4)
> The internal Windows build builds each directory (WTF, JavaScriptCore,
> WebCore, and WebKit) without the other directories where they are.  This
> causes problems with that setup.

Ah, I see. Thank you for letting me know about it

[Michael Catanzaro]

Alex, now that include(WebKitCommon) has been moved, surely those conditionals will never be hit anymore? I think Joonghun's patch is correct.

[Alex Christensen]

I wasn't aware they had moved.  We're still in the process of verifying the internal AppleWin build works, so I'd rather not touch this right now unless this is blocking something.

[Michael Catanzaro]

(In reply to comment #7)
> I wasn't aware they had moved.  We're still in the process of verifying the
> internal AppleWin build works, so I'd rather not touch this right now unless
> this is blocking something.

Any progress on this?

I'd still like to r+ this, but don't mind delaying if that's convenient for you.

[Csaba Osztrogonác]

Comment on attachment 270449 [details]
Patch

> The internal Windows build builds each directory (WTF, JavaScriptCore, WebCore, and WebKit) without the other directories where they are.  This causes problems with that setup.

So it is a dead code, out-of-tree use case isn't a good reason to keep dead code.
But I'd be happy to add it back once there is a public use-case in trunk.
(I know this strict policy since bug154323 from Filip Pizlo.)

Let's go ahead and remove it, r=me.

[WebKit Commit Bot]

Comment on attachment 270449 [details]
Patch

Clearing flags on attachment: 270449

Committed r196748: <http://trac.webkit.org/changeset/196748>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.