Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chores(cmake): bump version to 3.21.0 #4162

Merged
merged 4 commits into from
Mar 25, 2022
Merged

chores(cmake): bump version to 3.21.0 #4162

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c45c164
chores(cmake): bump version to 3.21.0
SchrodingerZhu Mar 1, 2022
85c525b
Merge branch 'master' into cmake-version
SchrodingerZhu Mar 25, 2022
71fbc22
address CR
SchrodingerZhu Mar 25, 2022
5e55b0a
address CR
SchrodingerZhu Mar 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

project (TiFlash)
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 3.21)
SchrodingerZhu marked this conversation as resolved.
Show resolved Hide resolved

set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${TiFlash_SOURCE_DIR}/cmake/Modules/")
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ git clone --recursive https://github.com/pingcap/tiflash.git
### Prerequisites

The following packages are needed for all platforms:
- CMake 3.13.2+
- CMake 3.21.0+
- Rust
```bash
curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain nightly
Expand Down
2 changes: 1 addition & 1 deletion dbms/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ if (Poco_Data_FOUND AND NOT USE_INTERNAL_POCO_LIBRARY)
endif()

if (Poco_NetSSL_FOUND)
target_link_libraries (clickhouse_common_io PRIVATE ${Poco_NetSSL_LIBRARY})
target_link_libraries (clickhouse_common_io PUBLIC ${Poco_NetSSL_LIBRARY})
SchrodingerZhu marked this conversation as resolved.
Show resolved Hide resolved
SchrodingerZhu marked this conversation as resolved.
Show resolved Hide resolved
endif()

target_link_libraries (dbms ${Poco_Foundation_LIBRARY})
Expand Down
2 changes: 1 addition & 1 deletion libs/libcommon/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ target_link_libraries (
)

if (RT_LIBRARY)
target_link_libraries (common ${RT_LIBRARY})
target_link_libraries (common PUBLIC ${RT_LIBRARY})
SchrodingerZhu marked this conversation as resolved.
Show resolved Hide resolved
endif ()

if (ENABLE_TESTS)
Expand Down