Skip to content

Commit 40a9e65

Browse files
committed
Fix FindPQXX.cmake typos
1 parent 33a296a commit 40a9e65

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

cmake/FindPQXX.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ find_library (PQXX_LIBRARIES
2828
NAMES pqxx
2929
DOC "pqxx library"
3030
)
31-
mark_as_advanced (PQXX_LIBRARY)
31+
mark_as_advanced (PQXX_LIBRARIES)
3232

3333

3434
if (PQXX_INCLUDE_DIR)
@@ -37,15 +37,15 @@ if (PQXX_INCLUDE_DIR)
3737
message(STATUS "PQXX_VERSION_FILE=${PQXX_VERSION_FILE}")
3838
file(READ "${PQXX_VERSION_FILE}" PQXX_FILE)
3939
string(REGEX MATCH "PQXX_VERSION \"([0-9]*).([0-9]*).([0-9]*)" PQXX_VERSION_LINE ${PQXX_FILE})
40-
string(REGEX REPLACE "PQXX_VERSION \"([0-9]*).([0-9]*).([0-9]*)" "\\1" PQXX_VERSION_MAYOR ${PQXX_VERSION_LINE})
40+
string(REGEX REPLACE "PQXX_VERSION \"([0-9]*).([0-9]*).([0-9]*)" "\\1" PQXX_VERSION_MAJOR ${PQXX_VERSION_LINE})
4141
string(REGEX REPLACE "PQXX_VERSION \"([0-9]*).([0-9]*).([0-9]*)" "\\2" PQXX_VERSION_MINOR ${PQXX_VERSION_LINE})
4242
string(REGEX REPLACE "PQXX_VERSION \"([0-9]*).([0-9]*).([0-9]*)" "\\3" PQXX_VERSION_MICRO ${PQXX_VERSION_LINE})
43-
set(PQXX_VERSION "${PQXX_VERSION_MAYOR}.${PQXX_VERSION_MINOR}.${PQXX_VERSION_MICRO}")
43+
set(PQXX_VERSION "${PQXX_VERSION_MAJOR}.${PQXX_VERSION_MINOR}.${PQXX_VERSION_MICRO}")
4444
message(STATUS "PQXX_VERSION=${PQXX_VERSION}")
45-
message(STATUS "PQXX_VERSION_MAYOR=${PQXX_VERSION_MAYOR}")
45+
message(STATUS "PQXX_VERSION_MAJOR=${PQXX_VERSION_MAJOR}")
4646
message(STATUS "PQXX_VERSION_MINOR=${PQXX_VERSION_MINOR}")
4747
message(STATUS "PQXX_VERSION_MICRO=${PQXX_VERSION_MICRO}")
48-
unset(PQXX_VERSION_MAYOR)
48+
unset(PQXX_VERSION_MAJOR)
4949
unset(PQXX_VERSION_MINOR)
5050
unset(PQXX_VERSION_MICRO)
5151
unset(PQXX_FILE)

tools/osmium/cmake/FindPQXX.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ find_library (PQXX_LIBRARIES
2828
NAMES pqxx
2929
DOC "pqxx library"
3030
)
31-
mark_as_advanced (PQXX_LIBRARY)
31+
mark_as_advanced (PQXX_LIBRARIES)
3232

3333

3434
if (PQXX_INCLUDE_DIR)
@@ -37,15 +37,15 @@ if (PQXX_INCLUDE_DIR)
3737
message(STATUS "PQXX_VERSION_FILE=${PQXX_VERSION_FILE}")
3838
file(READ "${PQXX_VERSION_FILE}" PQXX_FILE)
3939
string(REGEX MATCH "PQXX_VERSION \"([0-9]*).([0-9]*).([0-9]*)" PQXX_VERSION_LINE ${PQXX_FILE})
40-
string(REGEX REPLACE "PQXX_VERSION \"([0-9]*).([0-9]*).([0-9]*)" "\\1" PQXX_VERSION_MAYOR ${PQXX_VERSION_LINE})
40+
string(REGEX REPLACE "PQXX_VERSION \"([0-9]*).([0-9]*).([0-9]*)" "\\1" PQXX_VERSION_MAJOR ${PQXX_VERSION_LINE})
4141
string(REGEX REPLACE "PQXX_VERSION \"([0-9]*).([0-9]*).([0-9]*)" "\\2" PQXX_VERSION_MINOR ${PQXX_VERSION_LINE})
4242
string(REGEX REPLACE "PQXX_VERSION \"([0-9]*).([0-9]*).([0-9]*)" "\\3" PQXX_VERSION_MICRO ${PQXX_VERSION_LINE})
43-
set(PQXX_VERSION "${PQXX_VERSION_MAYOR}.${PQXX_VERSION_MINOR}.${PQXX_VERSION_MICRO}")
43+
set(PQXX_VERSION "${PQXX_VERSION_MAJOR}.${PQXX_VERSION_MINOR}.${PQXX_VERSION_MICRO}")
4444
message(STATUS "PQXX_VERSION=${PQXX_VERSION}")
45-
message(STATUS "PQXX_VERSION_MAYOR=${PQXX_VERSION_MAYOR}")
45+
message(STATUS "PQXX_VERSION_MAJOR=${PQXX_VERSION_MAJOR}")
4646
message(STATUS "PQXX_VERSION_MINOR=${PQXX_VERSION_MINOR}")
4747
message(STATUS "PQXX_VERSION_MICRO=${PQXX_VERSION_MICRO}")
48-
unset(PQXX_VERSION_MAYOR)
48+
unset(PQXX_VERSION_MAJOR)
4949
unset(PQXX_VERSION_MINOR)
5050
unset(PQXX_VERSION_MICRO)
5151
unset(PQXX_FILE)

0 commit comments

Comments
 (0)