Skip to content

Commit

Permalink
CMake find package generator fix
Browse files Browse the repository at this point in the history
  • Loading branch information
lasote committed May 30, 2018
1 parent 118eafb commit eb7b8e9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 2 additions & 1 deletion conans/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@
SERVER_CAPABILITIES = [COMPLEX_SEARCH_CAPABILITY, ]


__version__ = '1.4.0'
__version__ = '1.4.1'

3 changes: 1 addition & 2 deletions conans/client/generators/cmake_find_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
INTERFACE_INCLUDE_DIRECTORIES "${{{name}_INCLUDE_DIRS}}")
endif()
set_property(TARGET {name}::{name} PROPERTY INTERFACE_LINK_LIBRARIES ${{{name}_LIBRARIES_TARGETS}})
set_property(TARGET {name}::{name} PROPERTY INTERFACE_COMPILE_DEFINITIONS {deps.defines})
set_property(TARGET {name}::{name} PROPERTY INTERFACE_COMPILE_DEFINITIONS {deps.compile_definitions})
endif()
{find_dependencies}
endif()
Expand Down Expand Up @@ -89,7 +89,6 @@ def property_lines(prop):
return ["get_target_property(tmp %s %s)" % (dep_t, prop),
"if(tmp)",
" set_property(TARGET %s APPEND PROPERTY %s ${tmp})" % (lib_t, prop),
' message("${tmp}")',
'endif()']

lines.append("find_dependency(%s REQUIRED)" % dep)
Expand Down

0 comments on commit eb7b8e9

Please sign in to comment.