diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2012-05-28 06:01:45 -0700 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2012-05-28 06:01:45 -0700 |
| commit | ec3944d9c05fc5553469375661dbdaba42a57303 (patch) | |
| tree | f8b6e9b58d6cbe7b8936376f33b3c37d5ebceace | |
| parent | dae33d3f660e598c95b7c9feb67f5716227607ce (diff) | |
| parent | c403458b977dea4fcab756cf1644ed69440b5e2c (diff) | |
| download | mruby-ec3944d9c05fc5553469375661dbdaba42a57303.tar.gz mruby-ec3944d9c05fc5553469375661dbdaba42a57303.zip | |
Merge pull request #201 from thecodeshop/rm-cmake-tgt
remove extraneous cmake build targets
| -rw-r--r-- | mrblib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tools/mrbc/CMakeLists.txt | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/mrblib/CMakeLists.txt b/mrblib/CMakeLists.txt index b9fa22587..a0386f0fe 100644 --- a/mrblib/CMakeLists.txt +++ b/mrblib/CMakeLists.txt @@ -45,12 +45,10 @@ else() endif() -add_library(mrblib_object OBJECT mrblib.c) - # generate final static libmruby archive library add_library(libmruby_static STATIC + mrblib.c $<TARGET_OBJECTS:mruby_object> - $<TARGET_OBJECTS:mrblib_object> ) set_target_properties(libmruby_static PROPERTIES OUTPUT_NAME mruby) 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) |