From 78ee6c49474d43c05dc18197ee7629e5859ff8b3 Mon Sep 17 00:00:00 2001 From: yamacir-kit Date: Sun, 24 Sep 2023 17:47:11 +0900 Subject: [PATCH] Cleanup `CMakeLists.txt` Signed-off-by: yamacir-kit --- CMakeLists.txt | 9 +++++---- README.md | 6 +++--- VERSION | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1365b2001..4c9a7a59a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,14 +75,13 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/version.cpp ${CMAKE_CURRENT # ---- Target kernel ----------------------------------------------------------- -add_library(kernel SHARED "") +add_library(kernel SHARED) add_library(${PROJECT_NAME}::kernel ALIAS kernel) file(GLOB_RECURSE ${PROJECT_NAME}_KERNEL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*/*.cpp) -target_sources(kernel PRIVATE ${${PROJECT_NAME}_KERNEL_SOURCES} - PRIVATE ${${PROJECT_NAME}_OBJECTS}) +target_sources(kernel PRIVATE ${${PROJECT_NAME}_KERNEL_SOURCES}) target_include_directories(kernel PUBLIC $ @@ -98,7 +97,9 @@ set_target_properties(kernel PROPERTIES OUTPUT_NAME ${PROJECT_NAME} # Rename lib # ---- Target shell ------------------------------------------------------------ -add_executable(shell ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp) +add_executable(shell) + +target_sources(shell PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp) target_link_libraries(shell PRIVATE kernel) diff --git a/README.md b/README.md index 7508f1c69..3926e9a96 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ Subset of R7RS-small. cmake -B build -DCMAKE_BUILD_TYPE=Release cd build make package -sudo apt install build/meevax_0.4.812_amd64.deb +sudo apt install build/meevax_0.4.813_amd64.deb ``` or @@ -106,9 +106,9 @@ sudo rm -rf /usr/local/share/meevax | Target Name | Description |-------------|------------- -| `all` | Build shared-library `libmeevax.0.4.812.so` and executable `meevax` +| `all` | Build shared-library `libmeevax.0.4.813.so` and executable `meevax` | `test` | Test executable `meevax` -| `package` | Generate debian package `meevax_0.4.812_amd64.deb` +| `package` | Generate debian package `meevax_0.4.813_amd64.deb` | `install` | Copy files into `/usr/local` directly ## Usage diff --git a/VERSION b/VERSION index 0c7fe5eff..c8216caf8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.812 +0.4.813