Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Fred Wright
CMake
Commits
3031e9ee
Commit
3031e9ee
authored
Nov 13, 2006
by
Bill Hoffman
Browse files
ENH: merge changes in from main tree
parent
664c39d0
Changes
6
Hide whitespace changes
Inline
Side-by-side
ChangeLog.manual
View file @
3031e9ee
...
...
@@ -153,6 +153,14 @@ Changes in CMake 2.4.4
* Fix some odd cases with custom commands in VS 6
* Fix path suffix stuff with lib64 in FIND_* stuff.
* Fix delete in CMakeSetup to not change the current position in the list
* Fix debug stl run of ctest on Mac
* Use #2 for manifest command on dll and #1 on exe
Changes in CMake 2.4.3
* fix for 3557 - Under MSVC8 hardcoded TargetEnvironment for MIDL Compiler
...
...
Modules/CMakeVCManifestExe.cmake
0 → 100644
View file @
3031e9ee
# Leave the first line of this file empty so this module will not be
# included in the documentation.
# This script is invoked from Windows-cl.cmake and passed the TARGET
# variable on the command line.
# Conditionally embed the manifest in the executable if it exists.
IF
(
EXISTS
"
${
TARGET
}
.manifest"
)
# Construct the manifest embedding command.
SET
(
CMD
mt
${
CMAKE_CL_NOLOGO
}
/manifest
${
TARGET
}
.manifest
/outputresource:
${
TARGET
}
)
# Run the embedding command.
EXECUTE_PROCESS
(
COMMAND
${
CMD
}
\;\
#1 RESULT_VARIABLE RESULT)
# Check whether the command failed.
IF
(
NOT
"
${
RESULT
}
"
MATCHES
"^0$"
)
# The embedding failed remove the target and the manifest.
FILE
(
REMOVE
${
TARGET
}
${
TARGET
}
.manifest
)
# Describe the failure in a message.
STRING
(
REGEX REPLACE
";"
" "
CMD
"
${
CMD
}
"
)
MESSAGE
(
FATAL_ERROR
"Failed to embed manifest in
${
TARGET
}
using command
\"
${
CMD
}
;#1
\"
"
)
ENDIF
(
NOT
"
${
RESULT
}
"
MATCHES
"^0$"
)
ENDIF
(
EXISTS
"
${
TARGET
}
.manifest"
)
Modules/FindSubversion.cmake
0 → 100644
View file @
3031e9ee
# - Extract information from a subversion working copy
# The module defines the following variables:
# Subversion_SVN_EXECUTABLE - path to svn command line client
# Subversion_VERSION_SVN - version of svn command line client
# Subversion_FOUND - true if the command line client was found
# If the command line client executable is found the macro
# Subversion_WC_INFO(<dir> <var-prefix>)
# is defined to extract information of a subversion working copy at
# a given location. The macro defines the following variables:
# <var-prefix>_WC_URL - url of the repository (at <dir>)
# <var-prefix>_WC_ROOT - root url of the repository
# <var-prefix>_WC_REVISION - current revision
# <var-prefix>_WC_LAST_CHANGED_AUTHOR - author of last commit
# <var-prefix>_WC_LAST_CHANGED_DATE - date of last commit
# <var-prefix>_WC_LAST_CHANGED_REV - revision of last commit
# <var-prefix>_WC_LAST_CHANGED_LOG - last log of base revision
# <var-prefix>_WC_INFO - output of command `svn info <dir>'
# Example usage:
# FIND_PACKAGE(Subversion)
# IF(Subversion_FOUND)
# Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
# MESSAGE("Current revision is ${Project_WC_REVISION}")
# ENDIF(Subversion_FOUND)
# Copyright (c) 2006, Tristan Carel
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# * Neither the name of the University of California, Berkeley nor the
# names of its contributors may be used to endorse or promote products
# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# $Id$
SET
(
Subversion_FOUND FALSE
)
SET
(
Subversion_SVN_FOUND FALSE
)
FIND_PROGRAM
(
Subversion_SVN_EXECUTABLE svn
DOC
"subversion command line client"
)
MARK_AS_ADVANCED
(
Subversion_SVN_EXECUTABLE
)
IF
(
Subversion_SVN_EXECUTABLE
)
SET
(
Subversion_SVN_FOUND TRUE
)
SET
(
Subversion_FOUND TRUE
)
MACRO
(
Subversion_WC_INFO dir prefix
)
EXECUTE_PROCESS
(
COMMAND
${
Subversion_SVN_EXECUTABLE
}
--version
WORKING_DIRECTORY
${
PROJECT_SOURCE_DIR
}
OUTPUT_VARIABLE Subversion_VERSION_SVN
OUTPUT_STRIP_TRAILING_WHITESPACE
)
EXECUTE_PROCESS
(
COMMAND
${
Subversion_SVN_EXECUTABLE
}
info
${
dir
}
OUTPUT_VARIABLE
${
prefix
}
_WC_INFO
ERROR_VARIABLE Subversion_svn_info_error
RESULT_VARIABLE Subversion_svn_info_result
OUTPUT_STRIP_TRAILING_WHITESPACE
)
IF
(
NOT
${
Subversion_svn_info_result
}
EQUAL 0
)
MESSAGE
(
SEND_ERROR
"Command
\"
${
Subversion_SVN_EXECUTABLE
}
info
${
dir
}
\"
failed with output:
\n
${
Subversion_svn_info_error
}
"
)
ELSE
(
NOT
${
Subversion_svn_info_result
}
EQUAL 0
)
STRING
(
REGEX REPLACE
"^(.*
\n
)?svn, version ([.0-9]+).*"
"
\\
2"
Subversion_VERSION_SVN
"
${
Subversion_VERSION_SVN
}
"
)
STRING
(
REGEX REPLACE
"^(.*
\n
)?URL: ([^
\n
]+).*"
"
\\
2"
${
prefix
}
_WC_URL
"
${${
prefix
}
_WC_INFO
}
"
)
STRING
(
REGEX REPLACE
"^(.*
\n
)?Revision: ([^
\n
]+).*"
"
\\
2"
${
prefix
}
_WC_REVISION
"
${${
prefix
}
_WC_INFO
}
"
)
STRING
(
REGEX REPLACE
"^(.*
\n
)?Last Changed Author: ([^
\n
]+).*"
"
\\
2"
${
prefix
}
_WC_LAST_CHANGED_AUTHOR
"
${${
prefix
}
_WC_INFO
}
"
)
STRING
(
REGEX REPLACE
"^(.*
\n
)?Last Changed Rev: ([^
\n
]+).*"
"
\\
2"
${
prefix
}
_WC_LAST_CHANGED_REV
"
${${
prefix
}
_WC_INFO
}
"
)
STRING
(
REGEX REPLACE
"^(.*
\n
)?Last Changed Date: ([^
\n
]+).*"
"
\\
2"
${
prefix
}
_WC_LAST_CHANGED_DATE
"
${${
prefix
}
_WC_INFO
}
"
)
ENDIF
(
NOT
${
Subversion_svn_info_result
}
EQUAL 0
)
EXECUTE_PROCESS
(
COMMAND
${
Subversion_SVN_EXECUTABLE
}
log -r BASE
${
dir
}
OUTPUT_VARIABLE Subversion_LAST_CHANGED_LOG
ERROR_VARIABLE Subversion_svn_log_error
RESULT_VARIABLE Subversion_svn_log_result
OUTPUT_STRIP_TRAILING_WHITESPACE
)
IF
(
NOT
${
Subversion_svn_log_result
}
EQUAL 0
)
MESSAGE
(
SEND_ERROR
"Command
\"
${
Subversion_SVN_EXECUTABLE
}
log -r BASE
${
dir
}
\"
failed with output:
\n
${
Subversion_svn_log_error
}
"
)
ENDIF
(
NOT
${
Subversion_svn_log_result
}
EQUAL 0
)
ENDMACRO
(
Subversion_WC_INFO
)
ENDIF
(
Subversion_SVN_EXECUTABLE
)
IF
(
NOT Subversion_FOUND
)
IF
(
NOT Subversion_FIND_QUIETLY
)
MESSAGE
(
STATUS
"Subversion was not found."
)
ELSE
(
NOT Subversion_FIND_QUIETLY
)
IF
(
Subversion_FIND_REQUIRED
)
MESSAGE
(
FATAL_ERROR
"Subversion was not found."
)
ENDIF
(
Subversion_FIND_REQUIRED
)
ENDIF
(
NOT Subversion_FIND_QUIETLY
)
ENDIF
(
NOT Subversion_FOUND
)
# FindSubversion.cmake ends here.
Modules/Platform/Windows-cl.cmake
View file @
3031e9ee
...
...
@@ -218,10 +218,10 @@ IF(MSVC80)
# create a C shared module just copy the shared library rule
SET
(
CMAKE_C_CREATE_SHARED_MODULE
"
${
CMAKE_C_CREATE_SHARED_LIBRARY
}
"
)
SET
(
CMAKE_CXX_LINK_EXECUTABLE
"
${
CMAKE_CXX_LINK_EXECUTABLE
}
"
"$(CMAKE_COMMAND) -DTARGET=<TARGET> -DCMAKE_CL_NOLOGO=
${
CMAKE_CL_NOLOGO
}
-P
\"
${
CMAKE_ROOT
}
/Modules/CMakeVCManifest.cmake
\"
"
"$(CMAKE_COMMAND) -DTARGET=<TARGET> -DCMAKE_CL_NOLOGO=
${
CMAKE_CL_NOLOGO
}
-P
\"
${
CMAKE_ROOT
}
/Modules/CMakeVCManifest
Exe
.cmake
\"
"
)
SET
(
CMAKE_C_LINK_EXECUTABLE
"
${
CMAKE_C_LINK_EXECUTABLE
}
"
"$(CMAKE_COMMAND) -DTARGET=<TARGET> -DCMAKE_CL_NOLOGO=
${
CMAKE_CL_NOLOGO
}
-P
\"
${
CMAKE_ROOT
}
/Modules/CMakeVCManifest.cmake
\"
"
"$(CMAKE_COMMAND) -DTARGET=<TARGET> -DCMAKE_CL_NOLOGO=
${
CMAKE_CL_NOLOGO
}
-P
\"
${
CMAKE_ROOT
}
/Modules/CMakeVCManifest
Exe
.cmake
\"
"
)
SET
(
CMAKE_BUILD_TYPE_INIT Debug
)
...
...
Source/MFCDialog/PropertyList.cpp
View file @
3031e9ee
...
...
@@ -736,6 +736,12 @@ void CPropertyList::OnDelete()
this
->
HideControls
();
this
->
SetTopIndex
(
0
);
InvalidateList
();
m_curSel
+=
1
;
if
(
m_curSel
>
this
->
GetCount
())
{
m_curSel
=
this
->
GetCount
();
}
this
->
SetCurSel
(
m_curSel
);
}
void
CPropertyList
::
OnHelp
()
...
...
Source/cmFindBase.cxx
View file @
3031e9ee
...
...
@@ -621,21 +621,19 @@ void cmFindBase::ExpandRegistryAndCleanPath()
j
!=
this
->
SearchPathSuffixes
.
end
();
++
j
)
{
std
::
string
p
=
*
i
+
std
::
string
(
"/"
)
+
*
j
;
if
(
cmSystemTools
::
FileIsDirectory
(
p
.
c_str
()))
{
// add to all paths because the search path may be modified
// later with lib being replaced for lib64 which may exist
this
->
SearchPaths
.
push_back
(
p
);
}
}
}
// now put the path without the path suffixes in the SearchPaths
for
(
i
=
finalPath
.
begin
();
i
!=
finalPath
.
end
();
++
i
)
{
if
(
cmSystemTools
::
FileIsDirectory
(
i
->
c_str
()))
{
// put all search paths in because it may later be replaced
// by lib64 stuff fixes bug 4009
this
->
SearchPaths
.
push_back
(
*
i
);
}
}
}
void
cmFindBase
::
PrintFindStuff
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment