From 6f4eda74015d30083d406d227f6675302484c9f1 Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 27 May 2012 20:27:11 -0400 Subject: Simplify CMake mruby object library Also removes an unnecessary build target from the CMake generated build and project files. --- src/CMakeLists.txt | 1 - 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 $) # 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_link_libraries(mrbc ${MRUBY_LIBS}) install(TARGETS mrbc RUNTIME DESTINATION bin) -- cgit v1.2.3 From c403458b977dea4fcab756cf1644ed69440b5e2c Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 27 May 2012 22:06:28 -0400 Subject: Remove unnecessary mrblib object build target --- mrblib/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 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 $ - $ ) set_target_properties(libmruby_static PROPERTIES OUTPUT_NAME mruby) -- cgit v1.2.3