smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed use of ENV in CMake if (#7366)

Browse source 
* Fixed use of `ENV` in CMake `if`s and only set product name when no licensing

* Check for empty strings
This commit is contained in:
Nick Bolton 2024-07-04 19:23:47 +01:00 committed by GitHub
parent 4690b61551
commit 8c239d70b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cmake/Definitions.cmake
View file

@ -22,19 +22,19 @@ macro(configure_definitions)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(PRODUCT_NAME "Synergy 1 Community Edition")
if(DEFINED $ENV{SYNERGY_PRODUCT_NAME})
message(STATUS "Product name: $ENV{SYNERGY_PRODUCT_NAME}")
set(PRODUCT_NAME $ENV{SYNERGY_PRODUCT_NAME})
endif()
add_definitions(-DSYNERGY_PRODUCT_NAME="${PRODUCT_NAME}")
configure_ninja()
configure_options()
if(ENABLE_LICENSING)
message(STATUS "Licensing enabled")
add_definitions(-DSYNERGY_ENABLE_LICENSING=1)
else()
set(PRODUCT_NAME "Synergy 1 Community Edition")
if(NOT "$ENV{SYNERGY_PRODUCT_NAME}" STREQUAL "")
set(PRODUCT_NAME $ENV{SYNERGY_PRODUCT_NAME})
endif()
message(STATUS "Product name: ${PRODUCT_NAME}")
add_definitions(-DSYNERGY_PRODUCT_NAME="${PRODUCT_NAME}")
endif()
if(ENABLE_AUTO_CONFIG)
@ -87,24 +87,24 @@ macro(configure_options)
# licensing is off by default to make life easier for contributors.
set(DEFAULT_ENABLE_LICENSING OFF)
if(DEFINED $ENV{SYNERGY_BUILD_MINIMAL})
if("$ENV{SYNERGY_BUILD_MINIMAL}" STREQUAL "true")
set(DEFAULT_BUILD_GUI OFF)
set(DEFAULT_BUILD_INSTALLER OFF)
endif()
if(DEFINED $ENV{SYNERGY_NO_TESTS})
if("$ENV{SYNERGY_BUILD_TESTS}" STREQUAL "false")
set(DEFAULT_BUILD_TESTS OFF)
endif()
if(DEFINED $ENV{SYNERGY_BUILD_UNIFIED})
if("$ENV{SYNERGY_BUILD_UNIFIED}" STREQUAL "true")
set(DEFAULT_BUILD_UNIFIED ON)
endif()
if(DEFINED $ENV{SYNERGY_ENABLE_LICENSING})
if("$ENV{SYNERGY_ENABLE_LICENSING}" STREQUAL "true")
set(DEFAULT_ENABLE_LICENSING ON)
endif()
if(DEFINED $ENV{SYNERGY_ENABLE_COVERAGE})
if("$ENV{SYNERGY_ENABLE_COVERAGE}" STREQUAL "true")
set(DEFAULT_ENABLE_COVERAGE ON)
endif()