Skip to content
This repository was archived by the owner on Jul 1, 2023. It is now read-only.

Commit 58897bd

Browse files
committed
build: bump to CMake 3.16, centralise artifacts
Put all the libraries into lib, all the binaries into bin. This bumps up the CMake requirement to 3.16.0 to enable the co-located artifacts. It should make it easier for people to find the artifacts in the build tree.
1 parent a1b6606 commit 58897bd

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.15.1)
1+
cmake_minimum_required(VERSION 3.16.0)
22
project(TensorFlow
33
LANGUAGES Swift)
44

@@ -18,6 +18,9 @@ endif()
1818

1919
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
2020

21+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
22+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
23+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
2124
set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)
2225

2326
option(USE_BUNDLED_X10

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ For more models, go to [**tensorflow/swift-models**][swift-models].
9696
(between `_TF_MIN_BAZEL_VERSION` and `_TF_MAX_BAZEL_VERSION` as specified in
9797
[tensorflow/configure.py][configure.py]).
9898
* Python3 with [numpy][numpy].
99+
* CMake. CMake 3.16 or newer is required to build with CMake.
99100

100101
### Building and testing
101102

0 commit comments

Comments
 (0)