experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix cmake/external to use new include paths. (#4558)

Browse Source
This commit is contained in:
Derek Murray 2016-09-23 21:26:25 -07:00 committed by Martin Wicke
parent 0ed1dc2503
commit fe90fdb680
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tensorflow/contrib/cmake/external/farmhash.cmake vendored
View File

@ -45,7 +45,7 @@ endif()
# put farmhash includes in the directory where they are expected # put farmhash includes in the directory where they are expected
add_custom_target(farmhash_create_destination_dir add_custom_target(farmhash_create_destination_dir
COMMAND ${CMAKE_COMMAND} -E make_directory ${farmhash_INCLUDE_DIR}/farmhash-34c13ddfab0e35422f4c3979f360635a8c050260/src COMMAND ${CMAKE_COMMAND} -E make_directory ${farmhash_INCLUDE_DIR}
DEPENDS farmhash) DEPENDS farmhash)
add_custom_target(farmhash_copy_headers_to_destination add_custom_target(farmhash_copy_headers_to_destination
@ -53,5 +53,5 @@ add_custom_target(farmhash_copy_headers_to_destination
foreach(header_file ${farmhash_HEADERS}) foreach(header_file ${farmhash_HEADERS})
add_custom_command(TARGET farmhash_copy_headers_to_destination PRE_BUILD add_custom_command(TARGET farmhash_copy_headers_to_destination PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${header_file} ${farmhash_INCLUDE_DIR}/farmhash-34c13ddfab0e35422f4c3979f360635a8c050260/src) COMMAND ${CMAKE_COMMAND} -E copy ${header_file} ${farmhash_INCLUDE_DIR}/)
endforeach() endforeach()

6
tensorflow/contrib/cmake/external/gif.cmake vendored
View File

@ -1,6 +1,6 @@
include (ExternalProject) include (ExternalProject)
set(gif_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/gif_archive) set(gif_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/gif_archive/giflib-5.1.4/)
set(gif_URL http://ufpr.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz) set(gif_URL http://ufpr.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz)
set(gif_HASH SHA256=34a7377ba834397db019e8eb122e551a49c98f49df75ec3fcc92b9a794a4f6d1) set(gif_HASH SHA256=34a7377ba834397db019e8eb122e551a49c98f49df75ec3fcc92b9a794a4f6d1)
set(gif_INSTALL ${CMAKE_BINARY_DIR}/gif/install) set(gif_INSTALL ${CMAKE_BINARY_DIR}/gif/install)
@ -29,7 +29,7 @@ ExternalProject_Add(gif
# put gif includes in the directory where they are expected # put gif includes in the directory where they are expected
add_custom_target(gif_create_destination_dir add_custom_target(gif_create_destination_dir
COMMAND ${CMAKE_COMMAND} -E make_directory ${gif_INCLUDE_DIR}/giflib-5.1.4/lib COMMAND ${CMAKE_COMMAND} -E make_directory ${gif_INCLUDE_DIR}
DEPENDS gif) DEPENDS gif)
add_custom_target(gif_copy_headers_to_destination add_custom_target(gif_copy_headers_to_destination
@ -37,5 +37,5 @@ add_custom_target(gif_copy_headers_to_destination
foreach(header_file ${gif_HEADERS}) foreach(header_file ${gif_HEADERS})
add_custom_command(TARGET gif_copy_headers_to_destination PRE_BUILD add_custom_command(TARGET gif_copy_headers_to_destination PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${header_file} ${gif_INCLUDE_DIR}/giflib-5.1.4/lib/) COMMAND ${CMAKE_COMMAND} -E copy ${header_file} ${gif_INCLUDE_DIR}/)
endforeach() endforeach()

4
tensorflow/contrib/cmake/external/jpeg.cmake vendored
View File

@ -68,7 +68,7 @@ endif()
# put jpeg includes in the directory where they are expected # put jpeg includes in the directory where they are expected
add_custom_target(jpeg_create_destination_dir add_custom_target(jpeg_create_destination_dir
COMMAND ${CMAKE_COMMAND} -E make_directory ${jpeg_INCLUDE_DIR}/jpeg-9a COMMAND ${CMAKE_COMMAND} -E make_directory ${jpeg_INCLUDE_DIR}
DEPENDS jpeg) DEPENDS jpeg)
add_custom_target(jpeg_copy_headers_to_destination add_custom_target(jpeg_copy_headers_to_destination
@ -76,5 +76,5 @@ add_custom_target(jpeg_copy_headers_to_destination
foreach(header_file ${jpeg_HEADERS}) foreach(header_file ${jpeg_HEADERS})
add_custom_command(TARGET jpeg_copy_headers_to_destination PRE_BUILD add_custom_command(TARGET jpeg_copy_headers_to_destination PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${header_file} ${jpeg_INCLUDE_DIR}/jpeg-9a) COMMAND ${CMAKE_COMMAND} -E copy ${header_file} ${jpeg_INCLUDE_DIR})
endforeach() endforeach()

4
tensorflow/contrib/cmake/external/png.cmake vendored
View File

@ -32,7 +32,7 @@ ExternalProject_Add(png
## put png includes in the directory where they are expected ## put png includes in the directory where they are expected
add_custom_target(png_create_destination_dir add_custom_target(png_create_destination_dir
COMMAND ${CMAKE_COMMAND} -E make_directory ${png_INCLUDE_DIR}/libpng-1.2.53 COMMAND ${CMAKE_COMMAND} -E make_directory ${png_INCLUDE_DIR}
DEPENDS png) DEPENDS png)
add_custom_target(png_copy_headers_to_destination add_custom_target(png_copy_headers_to_destination
@ -40,5 +40,5 @@ add_custom_target(png_copy_headers_to_destination
foreach(header_file ${png_HEADERS}) foreach(header_file ${png_HEADERS})
add_custom_command(TARGET png_copy_headers_to_destination PRE_BUILD add_custom_command(TARGET png_copy_headers_to_destination PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${header_file} ${png_INCLUDE_DIR}/libpng-1.2.53) COMMAND ${CMAKE_COMMAND} -E copy ${header_file} ${png_INCLUDE_DIR}/)
endforeach() endforeach()