diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-30 14:43:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-30 14:44:36 (GMT) |
| commit | 2df8dbcdf26f6301d4c23e0988d6e4ebe3b7cae5 (patch) | |
| tree | a0ac5ef6407cb8c8af9d6c754a56c51f028804b6 | |
| parent | c23481d051569102b0ffa8f3300596d10b6d74ec (diff) | |
| parent | 18454ea44d6a1fd2dbc613ad9c3fe941639563aa (diff) | |
| download | CMake-2df8dbcdf26f6301d4c23e0988d6e4ebe3b7cae5.zip CMake-2df8dbcdf26f6301d4c23e0988d6e4ebe3b7cae5.tar.gz CMake-2df8dbcdf26f6301d4c23e0988d6e4ebe3b7cae5.tar.bz2 | |
Merge topic 'fix-find-package-mode'
18454ea4 cmake: Fix --find-package mode with imported targets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1208
| -rw-r--r-- | Source/cmakemain.cxx | 2 | ||||
| -rw-r--r-- | Tests/FindPackageModeMakefileTest/FindFoo.cmake.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index d4e1925..e6f88a7 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -299,7 +299,7 @@ int do_cmake(int ac, char const* const* av) return ret; } cmake::Role const role = - workingMode == cmake::NORMAL_MODE ? cmake::RoleProject : cmake::RoleScript; + workingMode == cmake::SCRIPT_MODE ? cmake::RoleScript : cmake::RoleProject; cmake cm(role); cm.SetHomeDirectory(""); cm.SetHomeOutputDirectory(""); diff --git a/Tests/FindPackageModeMakefileTest/FindFoo.cmake.in b/Tests/FindPackageModeMakefileTest/FindFoo.cmake.in index dc62bac..2eb7b7a 100644 --- a/Tests/FindPackageModeMakefileTest/FindFoo.cmake.in +++ b/Tests/FindPackageModeMakefileTest/FindFoo.cmake.in @@ -5,5 +5,7 @@ find_path(FOO_INCLUDE_DIR NAMES foo.h HINTS "@CMAKE_CURRENT_SOURCE_DIR@" ) set(FOO_LIBRARIES ${FOO_LIBRARY}) set(FOO_INCLUDE_DIRS "${FOO_INCLUDE_DIR}" "/some/path/with a space/include" ) +add_library(Foo::Foo INTERFACE IMPORTED) + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Foo DEFAULT_MSG FOO_LIBRARY FOO_INCLUDE_DIR ) |