mirror of
https://github.com/Kitware/CMake.git
synced 2025-12-31 02:39:48 -06:00
KWSys 2018-05-11 (46da6b14)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 46da6b14f03f27d8531f841b9f48c1fda452c915 (master).
Upstream Shortlog
-----------------
Kyle Edwards (2):
5b8bf75b INSTALL: move namelink into development component
e5733515 Fix recent regression in installation of namelink
luz.paz (1):
0e14a1a6 Misc. typos and whitespace fixes
This commit is contained in:
KWSys Upstream
committed by
Brad King
Brad King
parent
e488f73873
commit
55efd14733
@@ -196,6 +196,11 @@ IF(KWSYS_STANDALONE)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
# Choose default shared/static build if not specified.
|
||||
IF(NOT DEFINED KWSYS_BUILD_SHARED)
|
||||
SET(KWSYS_BUILD_SHARED ${BUILD_SHARED_LIBS})
|
||||
ENDIF()
|
||||
|
||||
# Include helper macros.
|
||||
INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/kwsysPlatformTests.cmake)
|
||||
INCLUDE(CheckTypeSize)
|
||||
@@ -230,13 +235,14 @@ ENDIF()
|
||||
|
||||
# Setup library install rules.
|
||||
SET(KWSYS_INSTALL_LIBRARY_RULE)
|
||||
SET(KWSYS_INSTALL_NAMELINK_RULE)
|
||||
IF(KWSYS_INSTALL_LIB_DIR)
|
||||
IF(KWSYS_INSTALL_EXPORT_NAME)
|
||||
LIST(APPEND KWSYS_INSTALL_LIBRARY_RULE EXPORT ${KWSYS_INSTALL_EXPORT_NAME})
|
||||
ENDIF()
|
||||
# Install the shared library to the lib directory.
|
||||
SET(KWSYS_INSTALL_LIBRARY_RULE ${KWSYS_INSTALL_LIBRARY_RULE}
|
||||
LIBRARY DESTINATION ${KWSYS_INSTALL_LIB_DIR}
|
||||
LIBRARY DESTINATION ${KWSYS_INSTALL_LIB_DIR} NAMELINK_SKIP
|
||||
)
|
||||
# Assign the shared library to the runtime component.
|
||||
IF(KWSYS_INSTALL_COMPONENT_NAME_RUNTIME)
|
||||
@@ -244,6 +250,17 @@ IF(KWSYS_INSTALL_LIB_DIR)
|
||||
COMPONENT ${KWSYS_INSTALL_COMPONENT_NAME_RUNTIME}
|
||||
)
|
||||
ENDIF()
|
||||
IF(KWSYS_BUILD_SHARED)
|
||||
SET(KWSYS_INSTALL_NAMELINK_RULE ${KWSYS_INSTALL_NAMELINK_RULE}
|
||||
LIBRARY DESTINATION ${KWSYS_INSTALL_LIB_DIR} NAMELINK_ONLY
|
||||
)
|
||||
# Assign the namelink to the development component.
|
||||
IF(KWSYS_INSTALL_COMPONENT_NAME_DEVELOPMENT)
|
||||
SET(KWSYS_INSTALL_NAMELINK_RULE ${KWSYS_INSTALL_NAMELINK_RULE}
|
||||
COMPONENT ${KWSYS_INSTALL_COMPONENT_NAME_DEVELOPMENT}
|
||||
)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
# Install the archive to the lib directory.
|
||||
SET(KWSYS_INSTALL_LIBRARY_RULE ${KWSYS_INSTALL_LIBRARY_RULE}
|
||||
@@ -427,11 +444,6 @@ ELSE()
|
||||
SET(KWSYS_NAME_IS_KWSYS 0)
|
||||
ENDIF()
|
||||
|
||||
# Choose default shared/static build if not specified.
|
||||
IF(KWSYS_BUILD_SHARED MATCHES "^KWSYS_BUILD_SHARED$")
|
||||
SET(KWSYS_BUILD_SHARED ${BUILD_SHARED_LIBS})
|
||||
ENDIF()
|
||||
|
||||
IF(KWSYS_BUILD_SHARED)
|
||||
SET(KWSYS_BUILD_SHARED 1)
|
||||
SET(KWSYS_LIBRARY_TYPE SHARED)
|
||||
@@ -933,6 +945,9 @@ IF(KWSYS_C_SRCS OR KWSYS_CXX_SRCS)
|
||||
IF(KWSYS_INSTALL_LIBRARY_RULE)
|
||||
INSTALL(TARGETS ${KWSYS_TARGET_INSTALL} ${KWSYS_INSTALL_LIBRARY_RULE})
|
||||
ENDIF()
|
||||
IF(KWSYS_INSTALL_NAMELINK_RULE)
|
||||
INSTALL(TARGETS ${KWSYS_TARGET_INSTALL} ${KWSYS_INSTALL_NAMELINK_RULE})
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
# Add a C-only library if requested.
|
||||
|
||||
@@ -218,7 +218,7 @@ inline std::string RegularExpressionMatch::match(int n) const
|
||||
* object as an argument and creates an object initialized with the
|
||||
* information from the given RegularExpression object.
|
||||
*
|
||||
* The find member function finds the first occurrence of the regular
|
||||
* The find member function finds the first occurrence of the regular
|
||||
* expression of that object in the string given to find as an argument. Find
|
||||
* returns a boolean, and if true, mutates the private data appropriately.
|
||||
* Find sets pointers to the beginning and end of the thing last found, they
|
||||
@@ -230,9 +230,9 @@ inline std::string RegularExpressionMatch::match(int n) const
|
||||
* the to see if the compiled regular expression is the same, and the
|
||||
* deep_equal functions also checks to see if the start and end pointers are
|
||||
* the same. The is_valid function returns false if program is set to NULL,
|
||||
* (i.e. there is no valid compiled exression). The set_invalid function sets
|
||||
* the program to NULL (Warning: this deletes the compiled expression). The
|
||||
* following examples may help clarify regular expression usage:
|
||||
* (i.e. there is no valid compiled expression). The set_invalid function
|
||||
* sets the program to NULL (Warning: this deletes the compiled expression).
|
||||
* The following examples may help clarify regular expression usage:
|
||||
*
|
||||
* * The regular expression "^hello" matches a "hello" only at the
|
||||
* beginning of a line. It would match "hello there" but not "hi,
|
||||
@@ -270,13 +270,13 @@ inline std::string RegularExpressionMatch::match(int n) const
|
||||
*
|
||||
* * The regular expression "(..p)b" matches something ending with pb
|
||||
* and beginning with whatever the two characters before the first p
|
||||
* encounterd in the line were. It would find "repb" in "rep drepa
|
||||
* encountered in the line were. It would find "repb" in "rep drepa
|
||||
* qrepb". The regular expression "(..p)a" would find "repa qrepb"
|
||||
* in "rep drepa qrepb"
|
||||
*
|
||||
* * The regular expression "d(..p)" matches something ending with p,
|
||||
* beginning with d, and having two characters in between that are
|
||||
* the same as the two characters before the first p encounterd in
|
||||
* the same as the two characters before the first p encountered in
|
||||
* the line. It would match "drepa qrepb" in "rep drepa qrepb".
|
||||
*
|
||||
* All methods of RegularExpression can be called simultaneously from
|
||||
|
||||
@@ -1270,7 +1270,7 @@ public:
|
||||
long GetLineNumber() const { return this->LineNumber; }
|
||||
|
||||
// Description:
|
||||
// Set the address where the biinary image is mapped
|
||||
// Set the address where the binary image is mapped
|
||||
// into memory.
|
||||
void SetBinaryBaseAddress(void* address)
|
||||
{
|
||||
@@ -4061,7 +4061,7 @@ bool SystemInformationImplementation::QueryLinuxMemory()
|
||||
|
||||
if (linuxMajor >= 3 || ((linuxMajor >= 2) && (linuxMinor >= 6))) {
|
||||
// new /proc/meminfo format since kernel 2.6.x
|
||||
// Rigorously, this test should check from the developping version 2.5.x
|
||||
// Rigorously, this test should check from the developing version 2.5.x
|
||||
// that introduced the new format...
|
||||
|
||||
enum
|
||||
|
||||
@@ -136,7 +136,7 @@ int testCommandLineArguments(int argc, char* argv[])
|
||||
arg.AddCallback("-C", argT::EQUAL_ARGUMENT, argument, random_ptr,
|
||||
"Option -C takes argument after =");
|
||||
arg.AddCallback("-D", argT::CONCAT_ARGUMENT, argument, random_ptr,
|
||||
"This option takes concatinated argument");
|
||||
"This option takes concatenated argument");
|
||||
arg.AddCallback("--long1", argT::NO_ARGUMENT, argument, random_ptr, "-A");
|
||||
arg.AddCallback("--long2", argT::SPACE_ARGUMENT, argument, random_ptr, "-B");
|
||||
arg.AddCallback("--long3", argT::EQUAL_ARGUMENT, argument, random_ptr,
|
||||
|
||||
Reference in New Issue
Block a user