summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Source/cmFindLibraryCommand.cxx4
-rw-r--r--Source/cmMakefile.cxx76
-rw-r--r--Source/cmMakefile.h8
-rw-r--r--Source/cmSystemTools.cxx62
-rw-r--r--Source/cmSystemTools.h5
5 files changed, 86 insertions, 69 deletions
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
index a00aaea..ff7bf44 100644
--- a/Source/cmFindLibraryCommand.cxx
+++ b/Source/cmFindLibraryCommand.cxx
@@ -127,9 +127,7 @@ bool cmFindLibraryCommand::InitialPass(std::vector<std::string> const& argsIn)
for(std::vector<std::string>::iterator i = names.begin();
i != names.end() ; ++i)
{
- library = cmSystemTools::FindLibrary(i->c_str(),
- path,
- m_Makefile);
+ library = m_Makefile->FindLibrary(i->c_str(), path);
if(library != "")
{
m_Makefile->AddCacheDefinition(args[0].c_str(),
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 912b2fb..7aad788 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1459,3 +1459,79 @@ void cmMakefile::DisplayStatus(const char* message, float s)
this->GetLocalGenerator()->GetGlobalGenerator()
->GetCMakeInstance()->UpdateProgress(message, s);
}
+
+/**
+ * Find the library with the given name. Searches the given path and then
+ * the system search path. Returns the full path to the library if it is
+ * found. Otherwise, the empty string is returned.
+ */
+std::string cmMakefile::FindLibrary(const char* name,
+ const std::vector<std::string>& userPaths)
+{
+ // See if the executable exists as written.
+ if(cmSystemTools::FileExists(name))
+ {
+ return cmSystemTools::CollapseFullPath(name);
+ }
+
+ // Add the system search path to our path.
+ std::vector<std::string> path = userPaths;
+ cmSystemTools::GetPath(path);
+
+ // Add some lib directories specific to compilers, depending on the
+ // current generator, so that library that might have been stored here
+ // can be found too.
+ // i.e. Microsoft Visual Studio or .Net: path to compiler/../Lib
+ // Borland: path to compiler/../Lib
+ const char* genName = this->GetDefinition("CMAKE_GENERATOR");
+ if (genName)
+ {
+ if (!strcmp(genName, "NMake Makefiles") ||
+ !strcmp(genName, "Visual Studio 6"))
+ {
+ const char* compiler = this->GetDefinition("CMAKE_CXX_COMPILER");
+ if (compiler)
+ {
+ std::string compiler_path = cmSystemTools::FindProgram(compiler);
+ if (compiler_path.size())
+ {
+ std::string lib_path =
+ cmSystemTools::GetFilenamePath(
+ cmSystemTools::GetFilenamePath(compiler_path)) + "/Lib";
+ path.push_back(lib_path);
+ }
+ }
+ }
+ else if (!strcmp(genName, "Visual Studio 7"))
+ {
+ // It is likely that the compiler won't be in the path for .Net, but
+ // we know where devenv is.
+ const char* devenv = this->GetDefinition("MICROSOFT_DEVENV");
+ if (devenv)
+ {
+ std::string devenv_path = cmSystemTools::FindProgram(devenv);
+ if (devenv_path.size())
+ {
+ std::string vc7_path =
+ cmSystemTools::GetFilenamePath(
+ cmSystemTools::GetFilenamePath(
+ cmSystemTools::GetFilenamePath(devenv_path))) + "/Vc7";
+ path.push_back(vc7_path + "/lib");
+ path.push_back(vc7_path + "/PlatformSDK/lib");
+ }
+ }
+ }
+ else if (!strcmp(genName, "Borland Makefiles"))
+ {
+ const char* bcb_bin_path = this->GetDefinition("BCB_BIN_PATH");
+ if (bcb_bin_path)
+ {
+ std::string lib_path =
+ cmSystemTools::GetFilenamePath(bcb_bin_path) + "/Lib";
+ path.push_back(lib_path);
+ }
+ }
+ }
+
+ return cmSystemTools::FindLibrary(name, path);
+}
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 695243a..8d1b546 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -19,7 +19,6 @@
#include "cmStandardIncludes.h"
#include "cmData.h"
-#include "cmSourceFile.h"
#include "cmSystemTools.h"
#include "cmSourceGroup.h"
#include "cmTarget.h"
@@ -29,6 +28,7 @@ class cmFunctionBlocker;
class cmCommand;
class cmLocalGenerator;
class cmMakeDepend;
+class cmSourceFile;
/** \class cmMakefile
* \brief Process the input CMakeLists.txt file.
@@ -185,6 +185,12 @@ public:
void AddIncludeDirectory(const char*, bool before = false);
/**
+ * Find a library (as in cmSystemTools) but add in compiler specific paths
+ */
+ std::string FindLibrary(const char* name,
+ const std::vector<std::string>& path);
+
+ /**
* Add a variable definition to the build. This variable
* can be used in CMake to refer to lists, directories, etc.
*/
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 6f89f94..b5ebed2 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -21,7 +21,6 @@
#include "cmRegularExpression.h"
#include <ctype.h>
#include "cmDirectory.h"
-#include "cmMakefile.h"
#include <errno.h>
@@ -1731,8 +1730,7 @@ std::string cmSystemTools::FindProgram(const char* name,
* found. Otherwise, the empty string is returned.
*/
std::string cmSystemTools::FindLibrary(const char* name,
- const std::vector<std::string>& userPaths,
- const cmMakefile *makefile)
+ const std::vector<std::string>& userPaths)
{
// See if the executable exists as written.
if(cmSystemTools::FileExists(name))
@@ -1743,64 +1741,6 @@ std::string cmSystemTools::FindLibrary(const char* name,
// Add the system search path to our path.
std::vector<std::string> path = userPaths;
cmSystemTools::GetPath(path);
-
- // Add some lib directories specific to compilers, depending on the
- // current generator, so that library that might have been stored here
- // can be found too.
- // i.e. Microsoft Visual Studio or .Net: path to compiler/../Lib
- // Borland: path to compiler/../Lib
- if (makefile)
- {
- const char* genName = makefile->GetDefinition("CMAKE_GENERATOR");
- if (genName)
- {
- if (!strcmp(genName, "NMake Makefiles") ||
- !strcmp(genName, "Visual Studio 6"))
- {
- const char* compiler = makefile->GetDefinition("CMAKE_CXX_COMPILER");
- if (compiler)
- {
- std::string compiler_path = cmSystemTools::FindProgram(compiler);
- if (compiler_path.size())
- {
- std::string lib_path =
- cmSystemTools::GetFilenamePath(
- cmSystemTools::GetFilenamePath(compiler_path)) + "/Lib";
- path.push_back(lib_path);
- }
- }
- }
- else if (!strcmp(genName, "Visual Studio 7"))
- {
- // It is likely that the compiler won't be in the path for .Net, but
- // we know where devenv is.
- const char* devenv = makefile->GetDefinition("MICROSOFT_DEVENV");
- if (devenv)
- {
- std::string devenv_path = cmSystemTools::FindProgram(devenv);
- if (devenv_path.size())
- {
- std::string vc7_path =
- cmSystemTools::GetFilenamePath(
- cmSystemTools::GetFilenamePath(
- cmSystemTools::GetFilenamePath(devenv_path))) + "/Vc7";
- path.push_back(vc7_path + "/lib");
- path.push_back(vc7_path + "/PlatformSDK/lib");
- }
- }
- }
- else if (!strcmp(genName, "Borland Makefiles"))
- {
- const char* bcb_bin_path = makefile->GetDefinition("BCB_BIN_PATH");
- if (bcb_bin_path)
- {
- std::string lib_path =
- cmSystemTools::GetFilenamePath(bcb_bin_path) + "/Lib";
- path.push_back(lib_path);
- }
- }
- }
- }
std::string tryPath;
for(std::vector<std::string>::const_iterator p = path.begin();
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index 9234283..190ebdb 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -19,8 +19,6 @@
#include "cmStandardIncludes.h"
-class cmMakefile;
-
/** \class cmSystemTools
* \brief A collection of useful functions for CMake.
*
@@ -236,8 +234,7 @@ public:
///! Find a library in the system PATH, with optional extra paths.
static std::string FindLibrary(const char* name,
- const std::vector<std::string>& path,
- const cmMakefile *makefile = 0);
+ const std::vector<std::string>& path);
///! return true if the file is a directory.
static bool FileIsDirectory(const char* name);
generated by cgit v0.12 at 2024-09-19 22:37:50 (GMT)