[CMake] Change hardcoded 'lib' and 'bin' in CMakeLists.txt to 'LIB_INSTALL_DIR' and...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 25 Sep 2012 03:22:13 +0000 (03:22 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 25 Sep 2012 03:22:13 +0000 (03:22 +0000)
https://bugs.webkit.org/show_bug.cgi?id=97419

Patch by Byungwoo Lee <bw80.lee@samsung.com> 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".

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

CMakeLists.txt
ChangeLog

index 5ff4edc493eecbbc4d17de955eb0d9a8f5ce6dc4..a91f25599b09e873063508320c88ebc25d41c0a1 100644 (file)
@@ -36,10 +36,6 @@ SET(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
 
 
 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)
 INCLUDE(WebKitMacros)
 INCLUDE(WebKitFS)
 INCLUDE(WebKitHelpers)
@@ -130,10 +126,17 @@ SET(WebKit_LIBRARY_TYPE SHARED)
 SET(WebKit2_LIBRARY_TYPE SHARED)
 SET(WebCoreTestSupport_LIBRARY_TYPE STATIC)
 
 SET(WebKit2_LIBRARY_TYPE SHARED)
 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
 # -----------------------------------------------------------------------------
 # -----------------------------------------------------------------------------
 # Port-specific options
 # -----------------------------------------------------------------------------
-INCLUDE(OptionsCommon)
 INCLUDE(Options${PORT})
 
 # -----------------------------------------------------------------------------
 INCLUDE(Options${PORT})
 
 # -----------------------------------------------------------------------------
index 55245e6c0c3b4fd63e160aee36d02389a6bf79e3..c47f1f546bcd232751ea16dec951b1d351f9b149 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2012-09-24  Byungwoo Lee  <bw80.lee@samsung.com>
+
+        [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  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r129343.
 2012-09-24  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r129343.