aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/contrib/cmake/external
diff options
context:
space:
mode:
Diffstat (limited to 'tensorflow/contrib/cmake/external')
-rw-r--r--tensorflow/contrib/cmake/external/boringssl.cmake6
-rw-r--r--tensorflow/contrib/cmake/external/jsoncpp.cmake6
-rw-r--r--tensorflow/contrib/cmake/external/lmdb.cmake6
-rw-r--r--tensorflow/contrib/cmake/external/png.cmake6
-rw-r--r--tensorflow/contrib/cmake/external/protobuf.cmake6
-rw-r--r--tensorflow/contrib/cmake/external/re2.cmake8
-rw-r--r--tensorflow/contrib/cmake/external/snappy.cmake8
-rw-r--r--tensorflow/contrib/cmake/external/sqlite.cmake6
-rw-r--r--tensorflow/contrib/cmake/external/zlib.cmake6
9 files changed, 11 insertions, 47 deletions
diff --git a/tensorflow/contrib/cmake/external/boringssl.cmake b/tensorflow/contrib/cmake/external/boringssl.cmake
index cca8444e2a..dc27eadaca 100644
--- a/tensorflow/contrib/cmake/external/boringssl.cmake
+++ b/tensorflow/contrib/cmake/external/boringssl.cmake
@@ -39,12 +39,8 @@ ExternalProject_Add(boringssl
# BUILD_IN_SOURCE 1
INSTALL_COMMAND ""
CMAKE_CACHE_ARGS
- if(tensorflow_ENABLE_POSITION_INDEPENDENT_CODE)
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
- else()
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=OFF
- endif()
-DCMAKE_BUILD_TYPE:STRING=Release
-DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+ -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
)
diff --git a/tensorflow/contrib/cmake/external/jsoncpp.cmake b/tensorflow/contrib/cmake/external/jsoncpp.cmake
index d2ae4c76e8..5127d7e8f7 100644
--- a/tensorflow/contrib/cmake/external/jsoncpp.cmake
+++ b/tensorflow/contrib/cmake/external/jsoncpp.cmake
@@ -42,12 +42,8 @@ ExternalProject_Add(jsoncpp
BUILD_IN_SOURCE 1
INSTALL_COMMAND ""
CMAKE_CACHE_ARGS
- if(tensorflow_ENABLE_POSITION_INDEPENDENT_CODE)
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
- else()
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=OFF
- endif()
-DCMAKE_BUILD_TYPE:STRING=Release
-DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+ -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
)
diff --git a/tensorflow/contrib/cmake/external/lmdb.cmake b/tensorflow/contrib/cmake/external/lmdb.cmake
index e41384f023..79971b7cfc 100644
--- a/tensorflow/contrib/cmake/external/lmdb.cmake
+++ b/tensorflow/contrib/cmake/external/lmdb.cmake
@@ -29,14 +29,10 @@ ExternalProject_Add(lmdb
INSTALL_DIR ${lmdb_INSTALL}
DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
CMAKE_CACHE_ARGS
- if(tensorflow_ENABLE_POSITION_INDEPENDENT_CODE)
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
- else()
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=OFF
- endif()
-DCMAKE_BUILD_TYPE:STRING=Release
-DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
-DCMAKE_INSTALL_PREFIX:STRING=${lmdb_INSTALL}
+ -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
)
if(WIN32)
diff --git a/tensorflow/contrib/cmake/external/png.cmake b/tensorflow/contrib/cmake/external/png.cmake
index aad6618f52..2b2bd47d1c 100644
--- a/tensorflow/contrib/cmake/external/png.cmake
+++ b/tensorflow/contrib/cmake/external/png.cmake
@@ -41,14 +41,10 @@ ExternalProject_Add(png
INSTALL_DIR ${png_INSTALL}
DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
CMAKE_CACHE_ARGS
- if(tensorflow_ENABLE_POSITION_INDEPENDENT_CODE)
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
- else()
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=OFF
- endif()
-DCMAKE_BUILD_TYPE:STRING=Release
-DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
-DCMAKE_INSTALL_PREFIX:STRING=${png_INSTALL}
+ -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-DZLIB_ROOT:STRING=${ZLIB_INSTALL}
)
diff --git a/tensorflow/contrib/cmake/external/protobuf.cmake b/tensorflow/contrib/cmake/external/protobuf.cmake
index b53857a47b..1e300e21df 100644
--- a/tensorflow/contrib/cmake/external/protobuf.cmake
+++ b/tensorflow/contrib/cmake/external/protobuf.cmake
@@ -44,12 +44,8 @@ ExternalProject_Add(protobuf
${PROTOBUF_ADDITIONAL_CMAKE_OPTIONS}
INSTALL_COMMAND ""
CMAKE_CACHE_ARGS
- if(tensorflow_ENABLE_POSITION_INDEPENDENT_CODE)
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
- else()
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=OFF
- endif()
-DCMAKE_BUILD_TYPE:STRING=Release
-DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+ -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-DZLIB_ROOT:STRING=${ZLIB_INSTALL}
)
diff --git a/tensorflow/contrib/cmake/external/re2.cmake b/tensorflow/contrib/cmake/external/re2.cmake
index b56f4b0898..cb4ec9c2de 100644
--- a/tensorflow/contrib/cmake/external/re2.cmake
+++ b/tensorflow/contrib/cmake/external/re2.cmake
@@ -38,11 +38,7 @@ ExternalProject_Add(re2
BUILD_IN_SOURCE 1
DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
CMAKE_CACHE_ARGS
- if(tensorflow_ENABLE_POSITION_INDEPENDENT_CODE)
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
- else()
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=OFF
- endif()
-DCMAKE_BUILD_TYPE:STRING=Release
-DCMAKE_INSTALL_PREFIX:STRING=${re2_INSTALL}
-)
+ -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
+) \ No newline at end of file
diff --git a/tensorflow/contrib/cmake/external/snappy.cmake b/tensorflow/contrib/cmake/external/snappy.cmake
index 926c271fd9..2d2451521c 100644
--- a/tensorflow/contrib/cmake/external/snappy.cmake
+++ b/tensorflow/contrib/cmake/external/snappy.cmake
@@ -40,15 +40,11 @@ ExternalProject_Add(snappy
LOG_CONFIGURE ON
LOG_BUILD ON
CMAKE_CACHE_ARGS
- if(tensorflow_ENABLE_POSITION_INDEPENDENT_CODE)
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
- else()
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=OFF
- endif()
-DCMAKE_BUILD_TYPE:STRING=Release
-DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
-DSNAPPY_BUILD_TESTS:BOOL=OFF
+ -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
)
# actually enables snappy in the source code
-add_definitions(-DTF_USE_SNAPPY) \ No newline at end of file
+add_definitions(-DTF_USE_SNAPPY)
diff --git a/tensorflow/contrib/cmake/external/sqlite.cmake b/tensorflow/contrib/cmake/external/sqlite.cmake
index 785039a469..1770dcb1fd 100644
--- a/tensorflow/contrib/cmake/external/sqlite.cmake
+++ b/tensorflow/contrib/cmake/external/sqlite.cmake
@@ -53,13 +53,9 @@ else()
INSTALL_DIR ${sqlite_INSTALL}
DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
CMAKE_CACHE_ARGS
- if(tensorflow_ENABLE_POSITION_INDEPENDENT_CODE)
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
- else()
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=OFF
- endif()
-DCMAKE_BUILD_TYPE:STRING=Release
-DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+ -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-DCMAKE_INSTALL_PREFIX:STRING=${sqlite_INSTALL}
)
diff --git a/tensorflow/contrib/cmake/external/zlib.cmake b/tensorflow/contrib/cmake/external/zlib.cmake
index f10f84336e..c8af611e1e 100644
--- a/tensorflow/contrib/cmake/external/zlib.cmake
+++ b/tensorflow/contrib/cmake/external/zlib.cmake
@@ -42,13 +42,9 @@ ExternalProject_Add(zlib
BUILD_IN_SOURCE 1
DOWNLOAD_DIR "${DOWNLOAD_LOCATION}"
CMAKE_CACHE_ARGS
- if(tensorflow_ENABLE_POSITION_INDEPENDENT_CODE)
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
- else()
- -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=OFF
- endif()
-DCMAKE_BUILD_TYPE:STRING=Release
-DCMAKE_INSTALL_PREFIX:STRING=${ZLIB_INSTALL}
+ -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
)
# put zlib includes in the directory where they are expected