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

BUG: fix bootstrap build on unix

This commit is contained in:
Bill Hoffman 2001-06-21 13:48:08 -04:00
parent 796fc4c495
commit a7d114cfd6
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CMakeLists.txt
View File

@ -27,7 +27,7 @@ cmSourceGroup.cxx
# configure the .h file # configure the .h file
CONFIGURE_FILE( CONFIGURE_FILE(
${CMake_SOURCE_DIR}/Source/cmConfigure.cmake.h.in ${CMake_SOURCE_DIR}/Source/cmConfigure.cmake.h.in
${CMake_BINARY_DIR}/Source/cmConfigure.cmake.h ) ${CMake_BINARY_DIR}/Source/cmConfigure.h )
# add the include path to find the .h # add the include path to find the .h
INCLUDE_DIRECTORIES(${CMake_BINARY_DIR}/Source) INCLUDE_DIRECTORIES(${CMake_BINARY_DIR}/Source)
# let cmake know it is supposed to use it # let cmake know it is supposed to use it

10
Source/cmSourceFile.cxx
View File

@ -78,7 +78,15 @@ void cmSourceFile::SetName(const char* name, const char* dir)
if(pos != std::string::npos) if(pos != std::string::npos)
{ {
m_SourceExtension = hname.substr(pos+1, hname.size()-pos); m_SourceExtension = hname.substr(pos+1, hname.size()-pos);
m_SourceName = hname.substr(0, pos); std::string::size_type pos2 = hname.rfind('/');
if(pos2 != std::string::npos)
{
m_SourceName = hname.substr(pos2+1, pos - pos2-1);
}
else
{
m_SourceName = hname.substr(0, pos);
}
} }
m_HeaderFileOnly = false; m_HeaderFileOnly = false;

5
Source/cmStandardIncludes.h
View File

@ -47,12 +47,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// include configure generated header to define // include configure generated header to define
// CMAKE_NO_ANSI_STREAM_HEADERS and CMAKE_NO_STD_NAMESPACE // CMAKE_NO_ANSI_STREAM_HEADERS and CMAKE_NO_STD_NAMESPACE
#ifdef CMAKE_HAS_AUTOCONF #if defined(CMAKE_HAS_AUTOCONF) || defined(CMAKE_BUILD_WITH_CMAKE)
#include "cmConfigure.h" #include "cmConfigure.h"
#endif #endif
#ifdef CMAKE_BUILD_WITH_CMAKE
#include "cmConfigure.cmake.h"
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning ( disable : 4786 ) #pragma warning ( disable : 4786 )