Skip to content

Commit 58694cb

Browse files
committed
CMake: use VERSION / LIBIIO_VERSION variables
Use these two variables instead of inlining their content. Signed-off-by: Paul Cercueil <[email protected]>
1 parent 42caf4b commit 58694cb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ if(WITH_DOC)
502502
set(CMAKE_CASE_SENSITIVE_FILESYSTEM "NO")
503503
endif()
504504

505-
set(CMAKE_HTML_DEST_DIR "${CMAKE_CURRENT_BINARY_DIR}/html/v${LIBIIO_VERSION_MAJOR}.${LIBIIO_VERSION_MINOR}")
505+
set(CMAKE_HTML_DEST_DIR "${CMAKE_CURRENT_BINARY_DIR}/html/v${VERSION}")
506506
set(CMAKE_API_DEST_DIR "${PROJECT_NAME}")
507507

508508
configure_file(
@@ -546,7 +546,7 @@ add_subdirectory(man)
546546

547547
# Create an installer if compiling for OSX
548548
if(OSX_PACKAGE)
549-
set(LIBIIO_PKG ${CMAKE_CURRENT_BINARY_DIR}/libiio-${VERSION}.g${LIBIIO_VERSION_GIT}.pkg)
549+
set(LIBIIO_PKG ${CMAKE_CURRENT_BINARY_DIR}/libiio-${LIBIIO_VERSION}.pkg)
550550
set(LIBIIO_TEMP_PKG ${CMAKE_CURRENT_BINARY_DIR}/libiio-${VERSION}-temp.pkg)
551551
set(LIBIIO_DISTRIBUTION_XML ${CMAKE_CURRENT_BINARY_DIR}/Distribution.xml)
552552
set(LIBIIO_FRAMEWORK_DIR ${CMAKE_CURRENT_BINARY_DIR}/iio.framework)

properties.rc.cmakein

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ BEGIN
1313
VALUE "LegalCopyright", "Copyright 2015-@BUILD_YEAR@ ADI and other contributors"
1414
VALUE "LegalTrademarks", "http://www.gnu.org/licenses/lgpl-2.1.html"
1515
VALUE "ProductName", "libiio"
16-
VALUE "ProductVersion", "@LIBIIO_VERSION_MAJOR@.@LIBIIO_VERSION_MINOR@-g@LIBIIO_VERSION_GIT@"
16+
VALUE "ProductVersion", "@VERSION@-g@LIBIIO_VERSION_GIT@"
1717
VALUE "OriginalFilename", "@LIBIIO_ORIGINAL_FILENAME@"
1818
END
1919
END

0 commit comments

Comments
 (0)