diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-29 15:33:24 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-08-29 15:33:24 -0400 |
| commit | 29907992277e0145a83368f3e8674b0608d745c5 (patch) | |
| tree | 50e030e004c4708c240136d633c8bcfabb2f31de | |
| parent | 05840793fda17ad261ed58c7dd797237bdea6c44 (diff) | |
| parent | 18454ea44d6a1fd2dbc613ad9c3fe941639563aa (diff) | |
| download | cmake-29907992277e0145a83368f3e8674b0608d745c5.tar.gz | |
Merge branch 'fix-find-package-mode' into release-3.9
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 c5a6836bf6..da1fe6d641 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -306,7 +306,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 dc62bac416..2eb7b7ab78 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 ) |