kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix for hp x11 and gl

Browse Source
This commit is contained in:
Bill Hoffman 2001-05-21 16:10:20 -04:00
parent c43e3a4f3f
commit c1086a9524
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmUnixMakefileGenerator.cxx
View File

@ -278,9 +278,10 @@ void cmUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout,
linkLibs += cmSystemTools::EscapeSpaces(dir.c_str()); linkLibs += cmSystemTools::EscapeSpaces(dir.c_str());
linkLibs += " "; linkLibs += " ";
librariesLinked += "-l"; librariesLinked += "-l";
if(reg.find(file)) cmRegularExpression libname("lib(.*)\\.(.*)");
if(libname.find(file))
{ {
file = reg.match(1); file = libname.match(1);
} }
librariesLinked += file; librariesLinked += file;
librariesLinked += " "; librariesLinked += " ";
@ -826,6 +827,12 @@ void cmUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
"${CMAKE_BINARY_DIR}/CMakeCache.txt", "${CMAKE_BINARY_DIR}/CMakeCache.txt",
"${CMAKE_COMMAND} " "${CMAKE_COMMAND} "
"-H${CMAKE_SOURCE_DIR} -B${CMAKE_BINARY_DIR}"); "-H${CMAKE_SOURCE_DIR} -B${CMAKE_BINARY_DIR}");
this->OutputMakeRule(fout,
"Rebuild the cache",
"${CMAKE_BINARY_DIR}/CMakeCache.txt",
0,
"${CMAKE_COMMAND} "
"-H${CMAKE_SOURCE_DIR} -B${CMAKE_BINARY_DIR}");
this->OutputMakeRule(fout, this->OutputMakeRule(fout,
"Rebuild cmake dummy rule", "Rebuild cmake dummy rule",
"${CMAKE_COMMAND}", "${CMAKE_COMMAND}",

2
Templates/CMakeSystemConfig.cmake.in
View File

@ -23,7 +23,7 @@ SET (CMAKE_SHLIB_LINK_FLAGS "@CMAKE_SHLIB_LINK_FLAGS@" CACHE_NO_REPLACE )
SET (CMAKE_SHLIB_LD_LIBS "@CMAKE_SHLIB_LD_LIBS@" CACHE_NO_REPLACE ) SET (CMAKE_SHLIB_LD_LIBS "@CMAKE_SHLIB_LD_LIBS@" CACHE_NO_REPLACE )
SET (CMAKE_SHLIB_LD_LIBS "@CMAKE_SHLIB_LD_LIBS@" CACHE_NO_REPLACE_NO_REPLACE ) SET (CMAKE_SHLIB_LD_LIBS "@CMAKE_SHLIB_LD_LIBS@" CACHE_NO_REPLACE_NO_REPLACE )
# support for X11 # support for X11
SET (CMAKE_X_LIBS "@X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@" CACHE_NO_REPLACE ) SET (CMAKE_X_LIBS "@X_PRE_LIBS@ @X_LIBS@ -lX11 -lXext @X_EXTRA_LIBS@" CACHE_NO_REPLACE )
SET (CMAKE_X_CFLAGS "@X_CFLAGS@" CACHE_NO_REPLACE) SET (CMAKE_X_CFLAGS "@X_CFLAGS@" CACHE_NO_REPLACE)
SET (CMAKE_HAS_X "@CMAKE_HAS_X@" CACHE_NO_REPLACE BOOL) SET (CMAKE_HAS_X "@CMAKE_HAS_X@" CACHE_NO_REPLACE BOOL)