Changeset: ede69e4262e7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ede69e4262e7
Modified Files:
CMakeLists.txt
Branch: cmake-fun
Log Message:
Merge.
diffs (25 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -425,8 +425,8 @@ if(NOT ${PYTHON2} STREQUAL "NO")
if(PYTHON2_LIBDIR AND PYTHON2_LIBDIR_CODE EQUAL 0)
string(LENGTH "${LIBDIR}" LIBDIR_LENGTH)
string(LENGTH "${PYTHON2_LIBDIR}"
PYTHON2_LIBDIR_PREFIX_LENGTH)
- math(EXPR TOTAL_LENGTH
"${PYTHON2_LIBDIR_PREFIX_LENGTH}-${LIBDIR_LENGTH}+1") # add the / separator
- string(SUBSTRING "${PYTHON2_LIBDIR}" ${LIBDIR_LENGTH}
${TOTAL_LENGTH} PYTHON2_LIBDIR) # remove the prefix
+ math(EXPR LEN1 "${LIBDIR_LENGTH}+1") # add the /
separator
+ string(SUBSTRING "${PYTHON2_LIBDIR}" ${LEN1} -1
PYTHON2_LIBDIR) # remove the prefix
elseif(${PYTHON2} STREQUAL "YES")
message(FATAL_ERROR "Could not find PYTHON2_LIBDIR")
else()
@@ -498,8 +498,8 @@ if(NOT ${PYTHON3} STREQUAL "NO")
if(PYTHON3_LIBDIR AND PYTHON3_LIBDIR_CODE EQUAL 0)
string(LENGTH "${LIBDIR}" LIBDIR_LENGTH)
string(LENGTH "${PYTHON3_LIBDIR}"
PYTHON3_LIBDIR_PREFIX_LENGTH)
- math(EXPR TOTAL_LENGTH
"${PYTHON3_LIBDIR_PREFIX_LENGTH}-${LIBDIR_LENGTH}+1") # add the / separator
- string(SUBSTRING "${PYTHON3_LIBDIR}" ${LIBDIR_LENGTH}
${TOTAL_LENGTH} PYTHON3_LIBDIR) # remove the prefix
+ math(EXPR LEN1 "${LIBDIR_LENGTH}+1") # add the /
separator
+ string(SUBSTRING "${PYTHON3_LIBDIR}" ${LEN1} -1
PYTHON3_LIBDIR) # remove the prefix
elseif(${PYTHON3} STREQUAL "YES")
message(FATAL_ERROR "Could not find PYTHON3_LIBDIR")
else()
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
