ENH: remove CMAKE_PREFIX so changing it does not rebuild all
This commit is contained in:
parent
068d0d9b91
commit
0dd276a311
@ -23,7 +23,6 @@
|
|||||||
#cmakedefine CMAKE_STRICT
|
#cmakedefine CMAKE_STRICT
|
||||||
#define CMAKE_ROOT_DIR "${CMake_SOURCE_DIR}"
|
#define CMAKE_ROOT_DIR "${CMake_SOURCE_DIR}"
|
||||||
#define CMAKE_BUILD_DIR "${CMake_BINARY_DIR}"
|
#define CMAKE_BUILD_DIR "${CMake_BINARY_DIR}"
|
||||||
#define CMAKE_PREFIX "${CMAKE_INSTALL_PREFIX}"
|
|
||||||
|
|
||||||
#define CMake_VERSION_MAJOR @CMake_VERSION_MAJOR@
|
#define CMake_VERSION_MAJOR @CMake_VERSION_MAJOR@
|
||||||
#define CMake_VERSION_MINOR @CMake_VERSION_MINOR@
|
#define CMake_VERSION_MINOR @CMake_VERSION_MINOR@
|
||||||
|
@ -841,14 +841,6 @@ int cmake::AddCMakePaths()
|
|||||||
cMakeRoot = CMAKE_ROOT_DIR;
|
cMakeRoot = CMAKE_ROOT_DIR;
|
||||||
modules = cMakeRoot + "/Modules/CMake.cmake";
|
modules = cMakeRoot + "/Modules/CMake.cmake";
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
#ifdef CMAKE_PREFIX
|
|
||||||
if (!cmSystemTools::FileExists(modules.c_str()))
|
|
||||||
{
|
|
||||||
// try compiled in install prefix
|
|
||||||
cMakeRoot = CMAKE_PREFIX CMAKE_DATA_DIR;
|
|
||||||
modules = cMakeRoot + "/Modules/CMake.cmake";
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
if (!cmSystemTools::FileExists(modules.c_str()))
|
if (!cmSystemTools::FileExists(modules.c_str()))
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user