Title: [129447] trunk
- Revision
- 129447
- Author
- [email protected]
- Date
- 2012-09-24 20:22:13 -0700 (Mon, 24 Sep 2012)
Log Message
[CMake] Change hardcoded 'lib' and 'bin' in CMakeLists.txt to 'LIB_INSTALL_DIR' and 'EXEC_INSTALL_DIR'.
https://bugs.webkit.org/show_bug.cgi?id=97419
Patch by Byungwoo Lee <[email protected]> on 2012-09-24
Reviewed by Gyuyoung Kim.
Use the value of LIB_INSTALL_DIR and EXEC_INSTALL_DIR instead of
hardcoding 'lib' and 'bin' for CMAKE_{ARCHIVE,LIBRARY,RUNTIME}_OUTPUT_DIRECTORY.
* CMakeLists.txt:
Use ${LIB_INSTALL_DIR} instead of hardcoding "lib".
Use ${EXEC_INSTALL_DIR} instead of hardcoding "bin".
Modified Paths
Diff
Modified: trunk/CMakeLists.txt (129446 => 129447)
--- trunk/CMakeLists.txt 2012-09-25 03:13:21 UTC (rev 129446)
+++ trunk/CMakeLists.txt 2012-09-25 03:22:13 UTC (rev 129447)
@@ -36,10 +36,6 @@
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
-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)
-
INCLUDE(WebKitMacros)
INCLUDE(WebKitFS)
INCLUDE(WebKitHelpers)
@@ -131,9 +127,16 @@
SET(WebCoreTestSupport_LIBRARY_TYPE STATIC)
# -----------------------------------------------------------------------------
+# Common options
+#------------------------------------------------------------------------------
+INCLUDE(OptionsCommon)
+SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${EXEC_INSTALL_DIR})
+
+# -----------------------------------------------------------------------------
# Port-specific options
# -----------------------------------------------------------------------------
-INCLUDE(OptionsCommon)
INCLUDE(Options${PORT})
# -----------------------------------------------------------------------------
Modified: trunk/ChangeLog (129446 => 129447)
--- trunk/ChangeLog 2012-09-25 03:13:21 UTC (rev 129446)
+++ trunk/ChangeLog 2012-09-25 03:22:13 UTC (rev 129447)
@@ -1,3 +1,17 @@
+2012-09-24 Byungwoo Lee <[email protected]>
+
+ [CMake] Change hardcoded 'lib' and 'bin' in CMakeLists.txt to 'LIB_INSTALL_DIR' and 'EXEC_INSTALL_DIR'.
+ https://bugs.webkit.org/show_bug.cgi?id=97419
+
+ Reviewed by Gyuyoung Kim.
+
+ Use the value of LIB_INSTALL_DIR and EXEC_INSTALL_DIR instead of
+ hardcoding 'lib' and 'bin' for CMAKE_{ARCHIVE,LIBRARY,RUNTIME}_OUTPUT_DIRECTORY.
+
+ * CMakeLists.txt:
+ Use ${LIB_INSTALL_DIR} instead of hardcoding "lib".
+ Use ${EXEC_INSTALL_DIR} instead of hardcoding "bin".
+
2012-09-24 Sheriff Bot <[email protected]>
Unreviewed, rolling out r129343.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
