Title: [195478] trunk
- Revision
- 195478
- Author
- achristen...@apple.com
- Date
- 2016-01-22 14:25:02 -0800 (Fri, 22 Jan 2016)
Log 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.
Modified Paths
Diff
Modified: trunk/CMakeLists.txt (195477 => 195478)
--- trunk/CMakeLists.txt 2016-01-22 22:24:32 UTC (rev 195477)
+++ trunk/CMakeLists.txt 2016-01-22 22:25:02 UTC (rev 195478)
@@ -112,9 +112,15 @@
# -----------------------------------------------------------------------------
# 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
Modified: trunk/ChangeLog (195477 => 195478)
--- trunk/ChangeLog 2016-01-22 22:24:32 UTC (rev 195477)
+++ trunk/ChangeLog 2016-01-22 22:25:02 UTC (rev 195478)
@@ -1,3 +1,15 @@
+2016-01-22 Alex Christensen <achristen...@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 <cgar...@igalia.com>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.11.4 release.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
