diff options
| author |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-09-13 12:11:54 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-09-13 12:11:54 -0700 |
| commit | 3f064b9a3e5125d20858c754e5d1db309b25b87f (patch) | |
| tree | 1dd74873b5fee0b64f31928aff6245c8b9f022ed /tensorflow/contrib/cmake | |
| parent | 0fbeac58e098cf0ac8e131617ebb6780e10c9606 (diff) | |
| parent | f35dc0a522ae630902baa5be16d2a53b59266770 (diff) | |
Merge pull request #19358 from brunomorishita:pr.fix_cmake_libpng
PiperOrigin-RevId: 212854521
Diffstat (limited to 'tensorflow/contrib/cmake')
| -rw-r--r-- | tensorflow/contrib/cmake/external/png.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tensorflow/contrib/cmake/external/png.cmake b/tensorflow/contrib/cmake/external/png.cmake index ad2af01bc0..1a147e9c8e 100644 --- a/tensorflow/contrib/cmake/external/png.cmake +++ b/tensorflow/contrib/cmake/external/png.cmake @@ -13,6 +13,7 @@ # limitations under the License. # ============================================================================== include (ExternalProject) +include (GNUInstallDirs) set(png_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/png_archive) set(png_URL https://mirror.bazel.build/github.com/glennrp/libpng/archive/v1.6.34.tar.gz) @@ -35,7 +36,7 @@ if(WIN32) endif() endif() else() - set(png_STATIC_LIBRARIES ${CMAKE_BINARY_DIR}/png/install/lib/libpng16.a) + set(png_STATIC_LIBRARIES ${CMAKE_BINARY_DIR}/png/install/${CMAKE_INSTALL_LIBDIR}/libpng16.a) endif() set(png_HEADERS |