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

BUG: There was no dependency for library targets on their required libraries. 

(Hopefully there aren't any cyclic dependencies for libraries.)
CMAKE_SHLIB_LINK is now used for executable targets.
This commit is contained in:
Amitha Perera 2001-06-12 10:45:41 -04:00
parent ff529aa861
commit 46aa1cb9c4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmUnixMakefileGenerator.cxx
View File

@ -440,9 +440,9 @@ void cmUnixMakefileGenerator::OutputTargets(std::ostream& fout)
fout << std::endl; fout << std::endl;
fout << "lib" << l->first << "$(SHLIB_SUFFIX): ${" << fout << "lib" << l->first << "$(SHLIB_SUFFIX): ${" <<
l->first << "_SRC_OBJS} \n"; l->first << "_SRC_OBJS} ${CMAKE_DEPEND_LIBS}\n";
fout << "\trm -f lib" << l->first << "$(SHLIB_SUFFIX)\n"; fout << "\trm -f lib" << l->first << "$(SHLIB_SUFFIX)\n";
fout << "\t$(CMAKE_CXX_COMPILER) ${CMAKE_SHLIB_LINK_FLAGS} ${CMAKE_CXX_FLAGS} ${CMAKE_SHLIB_BUILD_FLAGS} -o \\\n"; fout << "\t$(CMAKE_CXX_COMPILER) ${CMAKE_SHLIB_LINK_FLAGS} ${CMAKE_SHLIB_BUILD_FLAGS} ${CMAKE_CXX_FLAGS} -o \\\n";
fout << "\t lib" << l->first << "$(SHLIB_SUFFIX) \\\n"; fout << "\t lib" << l->first << "$(SHLIB_SUFFIX) \\\n";
fout << "\t ${" << l->first << fout << "\t ${" << l->first <<
"_SRC_OBJS} "; "_SRC_OBJS} ";
@ -454,7 +454,7 @@ void cmUnixMakefileGenerator::OutputTargets(std::ostream& fout)
{ {
fout << l->first << ": ${" << fout << l->first << ": ${" <<
l->first << "_SRC_OBJS} ${CMAKE_DEPEND_LIBS}\n"; l->first << "_SRC_OBJS} ${CMAKE_DEPEND_LIBS}\n";
fout << "\t${CMAKE_CXX_COMPILER} ${CMAKE_CXXFLAGS} ${" << fout << "\t${CMAKE_CXX_COMPILER} ${CMAKE_SHLIB_LINK_FLAGS} ${CMAKE_CXXFLAGS} ${" <<
l->first << "_SRC_OBJS} "; l->first << "_SRC_OBJS} ";
this->OutputLinkLibraries(fout, NULL,l->second); this->OutputLinkLibraries(fout, NULL,l->second);
fout << " -o " << l->first << "\n\n"; fout << " -o " << l->first << "\n\n";