diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-05-21 20:10:20 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-05-21 20:10:20 (GMT) |
| commit | c1086a9524399c3e16acf85d5180eeab92c78583 (patch) | |
| tree | 0addc6dcde68df2449c62d9a9b2d0ac209c02c83 | |
| parent | c43e3a4f3fbe2263418cc3a87d9c53c6b8e1bc62 (diff) | |
| download | CMake-c1086a9524399c3e16acf85d5180eeab92c78583.zip CMake-c1086a9524399c3e16acf85d5180eeab92c78583.tar.gz CMake-c1086a9524399c3e16acf85d5180eeab92c78583.tar.bz2 | |
fix for hp x11 and gl
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 11 | ||||
| -rw-r--r-- | Templates/CMakeSystemConfig.cmake.in | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index cadd0cd..344871b 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -278,9 +278,10 @@ void cmUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, linkLibs += cmSystemTools::EscapeSpaces(dir.c_str()); linkLibs += " "; librariesLinked += "-l"; - if(reg.find(file)) + cmRegularExpression libname("lib(.*)\\.(.*)"); + if(libname.find(file)) { - file = reg.match(1); + file = libname.match(1); } librariesLinked += file; librariesLinked += " "; @@ -827,6 +828,12 @@ void cmUnixMakefileGenerator::OutputMakeRules(std::ostream& fout) "${CMAKE_COMMAND} " "-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, "Rebuild cmake dummy rule", "${CMAKE_COMMAND}", 0, diff --git a/Templates/CMakeSystemConfig.cmake.in b/Templates/CMakeSystemConfig.cmake.in index 8c1c424..9ed8640 100644 --- a/Templates/CMakeSystemConfig.cmake.in +++ b/Templates/CMakeSystemConfig.cmake.in @@ -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_NO_REPLACE ) # 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_HAS_X "@CMAKE_HAS_X@" CACHE_NO_REPLACE BOOL) |