Skip to content

Commit

Permalink
bugfix - target error in tiff, patch error in lcms
Browse files Browse the repository at this point in the history
  • Loading branch information
madmongo1 committed Sep 30, 2016
1 parent a93cad8 commit 3aec28a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
20 changes: 8 additions & 12 deletions cmake/require_lcms.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ function (sanity_require_lcms given_version)
endif ()

sanity_make_flag(untar_flag "source.cache" "${package_name}" "untar")
sanity_make_flag(patch_flag "source.cache" "${package_name}" "patch")
sanity_make_flag(configure_flag "target" "${package_name}" "configure")

if (NOT EXISTS ${source_tree})
Expand All @@ -62,14 +61,6 @@ function (sanity_require_lcms given_version)
message(FATAL_ERROR "error in command tar xzf ${source_gz} : ${res}")
endif ()

sanity_touch_flag(untar_flag)
endif()

if (NOT EXISTS ${untar_flag})
sanity_touch_flag(untar_flag)
endif ()

if (${untar_flag} IS_NEWER_THAN ${patch_flag})
if ("${version}" STREQUAL "1.19")
set (patch_file "${sanity.root}/patch/${library}-${version}.patch")

Expand All @@ -84,16 +75,21 @@ function (sanity_require_lcms given_version)
MESSAGE(FATAL_ERROR "during patch: ${res}")
endif ()
endif ()
sanity_touch_flag(patch_flag)

sanity_touch_flag(untar_flag)
endif()

if (NOT EXISTS ${untar_flag})
sanity_touch_flag(untar_flag)
endif ()

set(untar_newer FALSE)
if (${patch_flag} IS_NEWER_THAN ${configure_flag})
if (${untar_flag} IS_NEWER_THAN ${configure_flag})
set(untar_newer TRUE)
endif ()

set(build_older FALSE)
if (${patch_flag} IS_NEWER_THAN ${build_dir})
if (${untar_flag} IS_NEWER_THAN ${build_dir})
set(build_older TRUE)
endif ()

Expand Down
3 changes: 2 additions & 1 deletion cmake/require_tiff.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ error code : ${res}"

set(component_names TIFF_FOUND TIFF_INCLUDE_DIR TIFF_LIBRARIES TIFF_LIBRARY TIFF_VERSION)
if (NOT TARGET sanity::tiff)
add_library(sanity::tiff INTERFACE IMPORTED GLOBAL ${TIFF_LIBRARIES})
add_library(sanity::tiff INTERFACE IMPORTED GLOBAL )
target_link_libraries(sanity::tiff INTERFACE ${TIFF_LIBRARIES})
set_property(TARGET sanity::tiff
APPEND
PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${TIFF_INCLUDE_DIRS})
Expand Down

0 comments on commit 3aec28a

Please sign in to comment.