diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdec6a4..2b97f54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,26 +1,34 @@
 # 为什么不指定 cmake_minimum_required 会导致下面在 project 处出错？
-#cmake_minimum_required(VERSION 3.10)
+# 不指定cmake_minimum_required=3时CMP0048为old，VERSION不允许在project中被指定
+cmake_minimum_required(VERSION 3.15)
 
-project(hellocmake VERSION 3.1.4 LANGUAGES CXX)
+project(hellocmake VERSION 3.1.4 LANGUAGES C CXX)
 
 # 如何让构建类型默认为 Release？
 #set(CMAKE_BUILD_TYPE Release)
+if (NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif() 
 
 # 这样设置 C++14 的方式对吗？请改正
-set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++14")
+# set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++14")
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # （可选）使用 ccache 加速编译
-find_program(CCACHE_PROGRAM ccache)
+# find_program(CCACHE_PROGRAM ccache)
 
 # legacy/CMakeLists.txt 和 mylib/CMakeLists.txt 里还有问题哦！
 add_subdirectory(legacy)
 add_subdirectory(mylib)
 
 # 这样需要一个个写出所有文件很麻烦，请改成自动批量添加源文件
-set(main_sources "src/main.cpp" "src/other.cpp" "src/dummy.cpp" "src/veryusefulfile.cpp")
+# set(main_sources "src/main.cpp" "src/other.cpp" "src/dummy.cpp" "src/veryusefulfile.cpp")
+file(GLOB main_sources src/*.cpp)
 add_executable(main ${main_sources})
-
+target_link_libraries(main PUBLIC mylib)
 # 请改为项目的正确版本（用变量来获取）
-target_compile_definitions(main PRIVATE HELLOCMAKE_VERSION="233.33.33")
+# target_compile_definitions(main PRIVATE HELLOCMAKE_VERSION="233.33.33")
+target_compile_definitions(main PRIVATE HELLOCMAKE_VERSION="${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
 # （可选）添加 run 作为伪目标方便命令行调用
diff --git a/mylib/CMakeLists.txt b/mylib/CMakeLists.txt
index f25aeef..1288e2f 100644
--- a/mylib/CMakeLists.txt
+++ b/mylib/CMakeLists.txt
@@ -1,9 +1,11 @@
 # 请改用自动批量查找所有 .cpp 和 .h 文件：
-set(mylib_sources "mylib/mylib.cpp" "mylib/mylib.h")
+# set(mylib_sources "mylib/mylib.cpp" "mylib/mylib.h")
+file(GLOB mylib_sources mylib/*.cpp mylib/*.h)
 
 # 使用 SHARED 在 Windows 上会遇到什么困难？请尝试修复!
+# 用的 WSL
 add_library(mylib SHARED ${mylib_sources})
 target_compile_definitions(mylib PRIVATE MYLIB_EXPORT)
 
 # 这里应该用 PRIVATE 还是 PUBLIC？
-target_include_directories(mylib PRIVATE .)
+target_include_directories(mylib PUBLIC .)