diff options
| author | Roger Leigh <rleigh@codelibre.net> | 2021-01-10 11:28:08 +0000 |
|---|---|---|
| committer | Roger Leigh <rleigh@codelibre.net> | 2021-01-10 11:28:08 +0000 |
| commit | 066e0952fb2c66e033dfda60060590895f0a68e0 (patch) | |
| tree | e2a9a4114c8c8c76996b36ae0a650050290faa0f /contrib | |
| parent | 17d2aa03b801b97b0f38d71c62eead81388520b3 (diff) | |
| parent | 33c3f7726bf430134cd48edd68fb294c5debb4be (diff) | |
| download | libtiff-git-066e0952fb2c66e033dfda60060590895f0a68e0.tar.gz | |
Merge branch 'include_libport' into 'master'
tiff tools and libtiff/mkg3states: include 'libport.h', remove local definition of 'getopt()'
See merge request libtiff/libtiff!198
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/addtiffo/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | contrib/dbs/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | contrib/iptcutil/CMakeLists.txt | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/contrib/addtiffo/CMakeLists.txt b/contrib/addtiffo/CMakeLists.txt index 45e733cd..71349194 100644 --- a/contrib/addtiffo/CMakeLists.txt +++ b/contrib/addtiffo/CMakeLists.txt @@ -26,10 +26,6 @@ extra_dist( README Makefile.vc) -include_directories(${PROJECT_SOURCE_DIR}/libtiff - ${PROJECT_BINARY_DIR}/libtiff - ${CMAKE_CURRENT_BINARY_DIR}) - add_executable(addtiffo addtiffo.c tif_overview.c tif_ovrcache.c tif_ovrcache.h) target_link_libraries(addtiffo tiff port) diff --git a/contrib/dbs/CMakeLists.txt b/contrib/dbs/CMakeLists.txt index ff3ce20c..77c58b7f 100644 --- a/contrib/dbs/CMakeLists.txt +++ b/contrib/dbs/CMakeLists.txt @@ -22,10 +22,6 @@ # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE # OF THIS SOFTWARE. -include_directories(${PROJECT_SOURCE_DIR}/libtiff - ${PROJECT_BINARY_DIR}/libtiff - ${CMAKE_CURRENT_BINARY_DIR}) - add_executable(tiff-bi tiff-bi.c) target_link_libraries(tiff-bi tiff port) diff --git a/contrib/iptcutil/CMakeLists.txt b/contrib/iptcutil/CMakeLists.txt index 35cc2612..27d6b249 100644 --- a/contrib/iptcutil/CMakeLists.txt +++ b/contrib/iptcutil/CMakeLists.txt @@ -27,9 +27,5 @@ extra_dist( test.iptc test.txt) -include_directories(${PROJECT_SOURCE_DIR}/libtiff - ${PROJECT_BINARY_DIR}/libtiff - ${CMAKE_CURRENT_BINARY_DIR}) - add_executable(iptcutil iptcutil.c) target_link_libraries(iptcutil tiff port) |