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

ENH: Fix ADD_DEPENDENCIES on Unix makefiles and fix SimpleInstall test not to link the module

This commit is contained in:
Andy Cedilnik 2004-02-03 09:26:36 -05:00
parent c06828a4a0
commit 59adb4eabe
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -1603,7 +1603,16 @@ void cmLocalUnixMakefileGenerator::OutputDependLibs(std::ostream& fout)
if(emitted.insert(*util).second)
{
// Output this dependency.
this->OutputExeDepend(fout, util->c_str());
std::string utilType = *util + "_LIBRARY_TYPE";
const char* libType = m_Makefile->GetDefinition(utilType.c_str());
if ( libType )
{
this->OutputLibDepend(fout, util->c_str());
}
else
{
this->OutputExeDepend(fout, util->c_str());
}
}
}
fout << "\n";

4
Tests/SimpleInstall/CMakeLists.txt
View File

@ -9,7 +9,9 @@ ADD_LIBRARY(test1 STATIC lib1.cxx)
ADD_LIBRARY(test2 SHARED lib2.cxx)
ADD_LIBRARY(test3 MODULE lib3.cxx)
ADD_EXECUTABLE (SimpleInstall inst.cxx foo.c foo.h)
TARGET_LINK_LIBRARIES(SimpleInstall test1 test2 test3)
TARGET_LINK_LIBRARIES(SimpleInstall test1 test2)
ADD_DEPENDENCIES(SimpleInstall test3)
INSTALL_TARGETS(/bin SimpleInstall)
INSTALL_TARGETS(/lib test1 test2 test3)

4
Tests/SimpleInstallS2/CMakeLists.txt
View File

@ -9,7 +9,9 @@ ADD_LIBRARY(test1 STATIC lib1.cxx)
ADD_LIBRARY(test2 SHARED lib2.cxx)
ADD_LIBRARY(test3 MODULE lib3.cxx)
ADD_EXECUTABLE (SimpleInstall inst.cxx foo.c foo.h)
TARGET_LINK_LIBRARIES(SimpleInstall test1 test2 test3)
TARGET_LINK_LIBRARIES(SimpleInstall test1 test2)
ADD_DEPENDENCIES(SimpleInstall test3)
INSTALL_TARGETS(/bin SimpleInstall)
INSTALL_TARGETS(/lib test1 test2 test3)