Changeset 195478 in webkit

Timestamp:

Jan 22, 2016, 2:25:02 PM (10 years ago)

Author:

achristensen@apple.com

Message:

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.

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/CMakeLists.txt

@@ -113 +113 @@
 # 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 ()
 
 # -----------------------------------------------------------------------------

trunk/ChangeLog

@@ +1 @@
+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>