[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
leandro at webkit.org
leandro at webkit.org
Wed Dec 22 12:10:08 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 02b64d124c04ad30ecf7573f25f2ab744e7af1f2
Author: leandro at webkit.org <leandro at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 16 16:44:46 2010 +0000
2010-08-16 Leandro Pereira <leandro at profusion.mobi>
[EFL] Build fix after r65366.
* CMakeLists.txt: Use if (VAR) instead of if (${VAR}) to check if
they're empty.
* jsc/CMakeLists.txt: Ditto.
* wtf/CMakeLists.txt: Ditto.
2010-08-16 Leandro Pereira <leandro at profusion.mobi>
[EFL] Build fix after r65366.
* CMakeLists.txt: Use if (VAR) instead of if (${VAR}) to check if
they're empty.
2010-08-16 Leandro Pereira <leandro at profusion.mobi>
[EFL] Build fix after r65366.
EFL port does not support automated tests yet.
* CMakeLists.txt: Use if (VAR) instead of if (${VAR}) to check if
they're empty.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65437 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/CMakeLists.txt b/JavaScriptCore/CMakeLists.txt
index f69cede..89c9ef1 100644
--- a/JavaScriptCore/CMakeLists.txt
+++ b/JavaScriptCore/CMakeLists.txt
@@ -262,7 +262,7 @@ ADD_DEFINITIONS(-DBUILDING_JavaScriptCore)
ADD_LIBRARY(${JavaScriptCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARY_TYPE} ${JavaScriptCore_HEADERS} ${JavaScriptCore_SOURCES})
TARGET_LINK_LIBRARIES(${JavaScriptCore_LIBRARY_NAME} ${JavaScriptCore_LIBRARIES})
-IF (${JavaScriptCore_LINK_FLAGS})
+IF (JavaScriptCore_LINK_FLAGS)
ADD_TARGET_PROPERTIES(${JavaScriptCore_LIBRARY_NAME} LINK_FLAGS "${JavaScriptCore_LINK_FLAGS}")
ENDIF ()
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 6d8bdb9..7f8b59f 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-16 Leandro Pereira <leandro at profusion.mobi>
+
+ [EFL] Build fix after r65366.
+
+ * CMakeLists.txt: Use if (VAR) instead of if (${VAR}) to check if
+ they're empty.
+ * jsc/CMakeLists.txt: Ditto.
+ * wtf/CMakeLists.txt: Ditto.
+
2010-08-15 Kevin Ollivier <kevino at theolliviers.com>
[wx] Build fix, don't build intermediate source in DerivedSources dir.
diff --git a/JavaScriptCore/jsc/CMakeLists.txt b/JavaScriptCore/jsc/CMakeLists.txt
index 9d792f0..1f529a5 100644
--- a/JavaScriptCore/jsc/CMakeLists.txt
+++ b/JavaScriptCore/jsc/CMakeLists.txt
@@ -16,7 +16,7 @@ INCLUDE_DIRECTORIES(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
ADD_EXECUTABLE(${JSC_EXECUTABLE_NAME} ${JSC_HEADERS} ${JSC_SOURCES})
TARGET_LINK_LIBRARIES(${JSC_EXECUTABLE_NAME} ${JSC_LIBRARIES})
-IF (${JSC_LINK_FLAGS})
+IF (JSC_LINK_FLAGS)
ADD_TARGET_PROPERTIES(${JSC_EXECUTABLE_NAME} LINK_FLAGS "${JSC_LINK_FLAGS}")
ENDIF ()
diff --git a/JavaScriptCore/wtf/CMakeLists.txt b/JavaScriptCore/wtf/CMakeLists.txt
index 7944547..896794e 100644
--- a/JavaScriptCore/wtf/CMakeLists.txt
+++ b/JavaScriptCore/wtf/CMakeLists.txt
@@ -39,7 +39,7 @@ ADD_DEFINITIONS(-DBUILDING_WTF)
ADD_LIBRARY(${WTF_LIBRARY_NAME} ${WTF_LIBRARY_TYPE} ${WTF_SOURCES})
TARGET_LINK_LIBRARIES(${WTF_LIBRARY_NAME} ${WTF_LIBRARIES})
-IF (${WTF_LINK_FLAGS})
+IF (WTF_LINK_FLAGS)
ADD_TARGET_PROPERTIES(${WTF_LIBRARY_NAME} LINK_FLAGS "${WTF_LINK_FLAGS}")
ENDIF ()
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index e04408d..6fbfb45 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -1934,7 +1934,7 @@ INCLUDE_DIRECTORIES(${WebCore_INCLUDE_DIRECTORIES})
ADD_LIBRARY(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
TARGET_LINK_LIBRARIES(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARIES})
-IF (${WebCore_LINK_FLAGS})
+IF (WebCore_LINK_FLAGS)
ADD_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} LINK_FLAGS "${WebCore_LINK_FLAGS}")
ENDIF ()
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7842426..de35424 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-16 Leandro Pereira <leandro at profusion.mobi>
+
+ [EFL] Build fix after r65366.
+
+ EFL port does not support automated tests yet.
+
+ * CMakeLists.txt: Use if (VAR) instead of if (${VAR}) to check if
+ they're empty.
+
2010-08-16 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebKit/CMakeLists.txt b/WebKit/CMakeLists.txt
index 2d27293..379c8e4 100644
--- a/WebKit/CMakeLists.txt
+++ b/WebKit/CMakeLists.txt
@@ -67,7 +67,7 @@ INCLUDE_DIRECTORIES(${WebKit_INCLUDE_DIRECTORIES})
ADD_LIBRARY(${WebKit_LIBRARY_NAME} ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
TARGET_LINK_LIBRARIES(${WebKit_LIBRARY_NAME} ${WebKit_LIBRARIES})
-IF (${WebKit_LINK_FLAGS})
+IF (WebKit_LINK_FLAGS)
ADD_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} LINK_FLAGS "${WebKit_LINK_FLAGS}")
ENDIF ()
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 200301e..eb7e953 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-16 Leandro Pereira <leandro at profusion.mobi>
+
+ [EFL] Build fix after r65366.
+
+ * CMakeLists.txt: Use if (VAR) instead of if (${VAR}) to check if
+ they're empty.
+
2010-08-14 Joseph Pecoraro <joepeck at webkit.org>
Reviewed by Pavel Feldman.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list