build: avoid policy CMP0053 warnings

On Windows there's an environment variable with parentheses, avoid the CMake warning
This commit is contained in:
Joshua M. Doe 2020-04-14 15:58:23 -04:00
parent 59715529c7
commit 6a9b31c7d4
8 changed files with 22 additions and 14 deletions

View File

@ -16,7 +16,8 @@ if (NOT EURESYS_DIR)
# 32-bit dir on win32
file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
# 32-bit dir on win64
file(TO_CMAKE_PATH "$ENV{ProgramFiles(x86)}" _PROG_FILES_X86)
set(_PROG_FILES_X86 "ProgramFiles(x86)")
file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
# use (x86) dir if exists
if (_PROG_FILES_X86)
@ -43,4 +44,4 @@ find_library (EURESYS_LIBRARIES NAMES MultiCam
DOC "EURESYS library to link with")
include (FindPackageHandleStandardArgs)
find_package_handle_standard_args (EURESYS DEFAULT_MSG EURESYS_INCLUDE_DIR EURESYS_LIBRARIES)
find_package_handle_standard_args (EURESYS DEFAULT_MSG EURESYS_INCLUDE_DIR EURESYS_LIBRARIES)

View File

@ -15,7 +15,8 @@ if (NOT IMPERX_FLEX_DIR)
# 32-bit dir on win32
file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
# 32-bit dir on win64
file(TO_CMAKE_PATH "$ENV{ProgramFiles(x86)}" _PROG_FILES_X86)
set(_PROG_FILES_X86 "ProgramFiles(x86)")
file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
# 64-bit dir on win64
file(TO_CMAKE_PATH "$ENV{ProgramW6432}" _PROG_FILES_W6432)
if (_PROG_FILES_X86)
@ -44,4 +45,4 @@ find_library (IMPERX_FLEX_LIBRARIES NAMES VCECLB
DOC "Imperx FrameLink Express library to link with")
include (FindPackageHandleStandardArgs)
find_package_handle_standard_args (IMPERX_FLEX DEFAULT_MSG IMPERX_FLEX_INCLUDE_DIR IMPERX_FLEX_LIBRARIES)
find_package_handle_standard_args (IMPERX_FLEX DEFAULT_MSG IMPERX_FLEX_INCLUDE_DIR IMPERX_FLEX_LIBRARIES)

View File

@ -15,7 +15,8 @@ if (NOT IMPERX_SDI_DIR)
# 32-bit dir on win32
file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
# 32-bit dir on win64
file(TO_CMAKE_PATH "$ENV{ProgramFiles(x86)}" _PROG_FILES_X86)
set(_PROG_FILES_X86 "ProgramFiles(x86)")
file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
# 64-bit dir on win64
file(TO_CMAKE_PATH "$ENV{ProgramW6432}" _PROG_FILES_W6432)
if (_PROG_FILES_X86)

View File

@ -15,7 +15,8 @@ if (NOT MATROX_DIR)
# 32-bit dir on win32
file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
# 32-bit dir on win64
file(TO_CMAKE_PATH "$ENV{ProgramFiles(x86)}" _PROG_FILES_X86)
set(_PROG_FILES_X86 "ProgramFiles(x86)")
file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
# 64-bit dir on win64
file(TO_CMAKE_PATH "$ENV{ProgramW6432}" _PROG_FILES_W6432)
@ -46,4 +47,4 @@ set (MATROX_LIBRARIES ${_MATROX_LIB})
mark_as_advanced (_MATROX_LIB)
include (FindPackageHandleStandardArgs)
find_package_handle_standard_args (MATROX DEFAULT_MSG MATROX_INCLUDE_DIR MATROX_LIBRARIES)
find_package_handle_standard_args (MATROX DEFAULT_MSG MATROX_INCLUDE_DIR MATROX_LIBRARIES)

View File

@ -15,7 +15,8 @@ if (NOT NIIMAQ_DIR)
# 32-bit dir on win32
file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
# 32-bit dir on win64
file(TO_CMAKE_PATH "$ENV{ProgramFiles(x86)}" _PROG_FILES_X86)
set(_PROG_FILES_X86 "ProgramFiles(x86)")
file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
# 64-bit dir on win64
file(TO_CMAKE_PATH "$ENV{ProgramW6432}" _PROG_FILES_W6432)
@ -49,4 +50,4 @@ endif ()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(NIIMAQ DEFAULT_MSG NIIMAQ_INCLUDE_DIR NIIMAQ_LIBRARIES)
mark_as_advanced(NIIMAQ_INCLUDE_DIR NIIMAQ_LIBRARIES)
mark_as_advanced(NIIMAQ_INCLUDE_DIR NIIMAQ_LIBRARIES)

View File

@ -13,7 +13,8 @@
if (NOT NIIMAQDX_DIR)
file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
file(TO_CMAKE_PATH "$ENV{ProgramFiles(x86)}" _PROG_FILES_X86)
set(_PROG_FILES_X86 "ProgramFiles(x86)")
file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
if (_PROG_FILES_X86)
set(_PROGFILESDIR "${_PROG_FILES_X86}")
else ()
@ -36,4 +37,4 @@ find_library (NIIMAQDX_LIBRARIES NAMES niimaqdx
include (FindPackageHandleStandardArgs)
find_package_handle_standard_args (NIIMAQDX DEFAULT_MSG NIIMAQDX_INCLUDE_DIR NIIMAQDX_LIBRARIES)
MARK_AS_ADVANCED(NIIMAQDX_INCLUDE_DIR NIIMAQDX_LIBRARIES)
MARK_AS_ADVANCED(NIIMAQDX_INCLUDE_DIR NIIMAQDX_LIBRARIES)

View File

@ -15,7 +15,8 @@ if (NOT SAPERA_DIR)
# 32-bit dir on win32
file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
# 32-bit dir on win64
file(TO_CMAKE_PATH "$ENV{ProgramFiles(x86)}" _PROG_FILES_X86)
set(_PROG_FILES_X86 "ProgramFiles(x86)")
file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
# 64-bit dir on win64
file(TO_CMAKE_PATH "$ENV{ProgramW6432}" _PROG_FILES_W6432)
if (_PROG_FILES_X86)
@ -52,4 +53,4 @@ else ()
endif ()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SAPERA DEFAULT_MSG SAPERA_INCLUDE_DIR SAPERA_LIBRARIES)
find_package_handle_standard_args(SAPERA DEFAULT_MSG SAPERA_INCLUDE_DIR SAPERA_LIBRARIES)

View File

@ -14,7 +14,8 @@ if (NOT XCLIB_DIR)
# 32-bit dir on win32
file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _PROG_FILES)
# 32-bit dir on win64
file(TO_CMAKE_PATH "$ENV{ProgramFiles(x86)}" _PROG_FILES_X86)
set(_PROG_FILES_X86 "ProgramFiles(x86)")
file(TO_CMAKE_PATH "$ENV{${_PROG_FILES_X86}}" _PROG_FILES_X86)
# 64-bit dir on win64
file(TO_CMAKE_PATH "$ENV{ProgramW6432}" _PROG_FILES_W6432)