Only set CMake output directories if they aren't already set
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Jan 2016 22:25:02 +0000 (22:25 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Jan 2016 22:25:02 +0000 (22:25 +0000)
https://bugs.webkit.org/show_bug.cgi?id=153373

Reviewed by Michael Catanzaro.

* CMakeLists.txt:
r195242 caused Windows builds to copy files to bin instead of bin64.
CMAKE_RUNTIME_OUTPUT_DIRECTORY is being set in OptionsWin.cmake, and this was now resetting it.
This also makes it so you can set these variables by command line.

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

CMakeLists.txt
ChangeLog

index 7a62c67..5d6644a 100644 (file)
@@ -112,9 +112,15 @@ include(WebKitCommon)
 # -----------------------------------------------------------------------------
 # Output directories
 #------------------------------------------------------------------------------
-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)
+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 ()
 
 # -----------------------------------------------------------------------------
 # Enable API unit tests and create a target for the test runner
index 940f776..93b0dde 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2016-01-22  Alex Christensen  <achristensen@webkit.org>
+
+        Only set CMake output directories if they aren't already set
+        https://bugs.webkit.org/show_bug.cgi?id=153373
+
+        Reviewed by Michael Catanzaro.
+
+        * CMakeLists.txt:
+        r195242 caused Windows builds to copy files to bin instead of bin64.
+        CMAKE_RUNTIME_OUTPUT_DIRECTORY is being set in OptionsWin.cmake, and this was now resetting it.
+        This also makes it so you can set these variables by command line.
+
 2016-01-20  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.11.4 release.