[CMake] Remove meaningless conditional statements in CMakeLists.txt
authorjh718.park@samsung.com <jh718.park@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 18 Feb 2016 08:28:44 +0000 (08:28 +0000)
committerjh718.park@samsung.com <jh718.park@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 18 Feb 2016 08:28:44 +0000 (08:28 +0000)
https://bugs.webkit.org/show_bug.cgi?id=153778

Reviewed by Csaba Osztrogon√°c.

* CMakeLists.txt:
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196748 268f45cc-cd09-0410-ab3c-d52691b4dbfc

CMakeLists.txt
ChangeLog

index d583215..0e0ea23 100644 (file)
@@ -105,17 +105,11 @@ set(WebCoreTestSupport_LIBRARY_TYPE STATIC)
 option(SHOULD_INSTALL_JS_SHELL "generate an installation rule to install the built JavaScript shell")
 
 # -----------------------------------------------------------------------------
-# Output directories
+# Default output directories, which can be overwritten by ports
 #------------------------------------------------------------------------------
-if (NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-endif ()
-if (NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-endif ()
-if (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-endif ()
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 # -----------------------------------------------------------------------------
 # Common configuration
index 570a1e6..921ba04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2016-02-18  Joonghun Park  <jh718.park@samsung.com>
+
+        [CMake] Remove meaningless conditional statements in CMakeLists.txt
+        https://bugs.webkit.org/show_bug.cgi?id=153778
+
+        Reviewed by Csaba Osztrogon√°c.
+
+        * CMakeLists.txt:
+        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.
+
 2016-02-15  Alex Christensen  <achristensen@webkit.org>
 
         Re-enable INTL on WinCairo