summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2015-12-24 10:51:31 -0800
committerAlon Zakai <alonzakai@gmail.com>2015-12-24 10:51:31 -0800
commitfe9fb1844dec17fe48ef8c70ef6cec0679e63cb6 (patch)
tree0da77f9bf580f0f6b4f48894a866ef26994bec00
parentfbf23be76c01b706ff3cd661a1463546291c5f9c (diff)
parent61fd115827c9dc02965fc56ee84d0f6b41ce0caf (diff)
downloadbinaryen-fe9fb1844dec17fe48ef8c70ef6cec0679e63cb6.tar.gz
binaryen-fe9fb1844dec17fe48ef8c70ef6cec0679e63cb6.tar.bz2
binaryen-fe9fb1844dec17fe48ef8c70ef6cec0679e63cb6.zip
Merge pull request #48 from WebAssembly/lib-dir
Specify a library and archive output directory
-rw-r--r--CMakeLists.txt2
-rw-r--r--lib/empty.txt0
2 files changed, 2 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a77133560..a7d37068e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12.2)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src)
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
+SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
IF(MSVC)
SET(CMAKE_CXX_FLAGS "/arch:sse2 ${CMAKE_CXX_FLAGS}")
diff --git a/lib/empty.txt b/lib/empty.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/lib/empty.txt