diff options
| author | Jon <[email protected]> | 2012-05-27 20:27:11 -0400 |
|---|---|---|
| committer | Jon <[email protected]> | 2012-05-27 20:27:11 -0400 |
| commit | 6f4eda74015d30083d406d227f6675302484c9f1 (patch) | |
| tree | 1cea5e41b82ca2a1533356b62d06162dbb8a4194 | |
| parent | c14e440897b2cf8c0769f00d9a14810b11ca9a99 (diff) | |
| download | mruby-6f4eda74015d30083d406d227f6675302484c9f1.tar.gz mruby-6f4eda74015d30083d406d227f6675302484c9f1.zip | |
Simplify CMake mruby object library
Also removes an unnecessary build target from the CMake generated
build and project files.
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tools/mrbc/CMakeLists.txt | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 390129eb9..4a6aeee2c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,6 +7,5 @@ file(GLOB MRUBY_SRC_C "*.c") list(APPEND MRUBY_SRC_C "${CMAKE_CURRENT_BINARY_DIR}/parse.c") add_library(mruby_object OBJECT ${MRUBY_SRC_C} ${BISON_mruby_OUTPUTS}) -add_library(mruby_static STATIC EXCLUDE_FROM_ALL $<TARGET_OBJECTS:mruby_object>) # vim: ts=2 sts=2 sw=2 et diff --git a/tools/mrbc/CMakeLists.txt b/tools/mrbc/CMakeLists.txt index 71a3a937d..043b7dc83 100644 --- a/tools/mrbc/CMakeLists.txt +++ b/tools/mrbc/CMakeLists.txt @@ -1,8 +1,8 @@ # build tools/mrbc executable file(GLOB MRBC_SRC_C "*.c") -add_executable(mrbc ${MRBC_SRC_C}) -target_link_libraries(mrbc mruby_static ${MRUBY_LIBS}) +add_executable(mrbc ${MRBC_SRC_C} $<TARGET_OBJECTS:mruby_object>) +target_link_libraries(mrbc ${MRUBY_LIBS}) install(TARGETS mrbc RUNTIME DESTINATION bin) |