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)
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
# -----------------------------------------------------------------------------
-INCLUDE(OptionsCommon)
INCLUDE(Options${PORT})
# -----------------------------------------------------------------------------
+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.