apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-28 02:48:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensured that the cmake variable is always initialized/set to some value when compared and thereby has an expected value

Browse Source
This commit is contained in:
Alvin Moore 2019-12-23 11:50:01 -08:00
parent 325d553973
commit 6acf04bb72
7 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -95,9 +95,6 @@ if(USE_VERSIONS_TARGET)
set(FDB_VERSION ${FDB_VERION_TARGET_FILE}) set(FDB_VERSION ${FDB_VERION_TARGET_FILE})
set(FDB_PACKAGE_NAME ${FDB_PACKAGE_NAME_TARGET_FILE}) set(FDB_PACKAGE_NAME ${FDB_PACKAGE_NAME_TARGET_FILE})
set(FDB_VERSION_PLAIN ${FDB_VERSION}) set(FDB_VERSION_PLAIN ${FDB_VERSION})
if(NOT FDB_RELEASE)
set(FDB_VERSION "${FDB_VERSION}-PRERELEASE")
endif()
else() else()
set(FDB_PACKAGE_NAME "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") set(FDB_PACKAGE_NAME "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
set(FDB_VERSION ${PROJECT_VERSION}) set(FDB_VERSION ${PROJECT_VERSION})

2
bindings/flow/CMakeLists.txt
View File

@ -31,6 +31,8 @@ if(NOT OPEN_FOR_IDE)
if(NOT FDB_RELEASE) if(NOT FDB_RELEASE)
set(prerelease_string "-PRERELEASE") set(prerelease_string "-PRERELEASE")
else()
set(prerelease_string "")
endif() endif()
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/packages) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/packages)

2
bindings/java/CMakeLists.txt
View File

@ -228,6 +228,8 @@ if(NOT OPEN_FOR_IDE)
add_dependencies(copy_lib unpack_jar) add_dependencies(copy_lib unpack_jar)
if(NOT FDB_RELEASE) if(NOT FDB_RELEASE)
set(prerelease_string "-PRERELEASE") set(prerelease_string "-PRERELEASE")
else()
set(prerelease_string "")
endif() endif()
set(target_jar ${jar_destination}/fdb-java-${CMAKE_PROJECT_VERSION}${prerelease_string}.jar) set(target_jar ${jar_destination}/fdb-java-${CMAKE_PROJECT_VERSION}${prerelease_string}.jar)
add_custom_command(OUTPUT ${target_jar} add_custom_command(OUTPUT ${target_jar}

2
bindings/python/CMakeLists.txt
View File

@ -61,6 +61,8 @@ else()
endif() endif()
if(NOT FDB_RELEASE) if(NOT FDB_RELEASE)
set(prerelease_string "a1") set(prerelease_string "a1")
else()
set(prerelease_string "")
endif() endif()
set(setup_file_name foundationdb-${FDB_VERSION}.tar.gz) set(setup_file_name foundationdb-${FDB_VERSION}.tar.gz)
set(package_file ${CMAKE_BINARY_DIR}/packages/foundationdb-${FDB_VERSION}${prerelease_string}.tar.gz) set(package_file ${CMAKE_BINARY_DIR}/packages/foundationdb-${FDB_VERSION}${prerelease_string}.tar.gz)

2
bindings/ruby/CMakeLists.txt
View File

@ -6,6 +6,8 @@ configure_file(fdb.gemspec.cmake fdb.gemspec)
if(NOT FDB_RELEASE) if(NOT FDB_RELEASE)
set(prerelease_string "PRERELEASE") set(prerelease_string "PRERELEASE")
else()
set(prerelease_string "")
endif() endif()
set(setup_file fdb-${FDB_VERSION}.gem) set(setup_file fdb-${FDB_VERSION}.gem)

2
cmake/CPackConfig.cmake
View File

@ -35,6 +35,8 @@ elseif(CPACK_GENERATOR MATCHES "productbuild")
set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_BINARY_DIR}/License.txt) set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_BINARY_DIR}/License.txt)
if(NOT FDB_RELEASE) if(NOT FDB_RELEASE)
set(prerelease_string "-PRERELEASE") set(prerelease_string "-PRERELEASE")
else()
set(prerelease_string "")
endif() endif()
set(CPACK_PACKAGE_FILE_NAME "FoundationDB-${PROJECT_VERSION}${prerelease_string}") set(CPACK_PACKAGE_FILE_NAME "FoundationDB-${PROJECT_VERSION}${prerelease_string}")
elseif(CPACK_GENERATOR MATCHES "TGZ") elseif(CPACK_GENERATOR MATCHES "TGZ")

2
packaging/msi/CMakeLists.txt
View File

@ -30,6 +30,8 @@ if(WIX_FOUND)
add_dependencies(wixobj fdbserver fdbcli fdbmonitor fdb_c fdbbackup python_binding) add_dependencies(wixobj fdbserver fdbcli fdbmonitor fdb_c fdbbackup python_binding)
if(NOT FDB_RELEASE) if(NOT FDB_RELEASE)
set(prerelease_string "-PRERELEASE") set(prerelease_string "-PRERELEASE")
else()
set(prerelease_string "")
endif() endif()
# 64 bits # 64 bits
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)