From 6a9b31c7d4113fc086ba2d226ceffe093f9a356d Mon Sep 17 00:00:00 2001 From: "Joshua M. Doe" Date: Tue, 14 Apr 2020 15:58:23 -0400 Subject: [PATCH] build: avoid policy CMP0053 warnings On Windows there's an environment variable with parentheses, avoid the CMake warning --- cmake/modules/FindEuresys.cmake | 5 +++-- cmake/modules/FindImperx.cmake | 5 +++-- cmake/modules/FindImperxSDI.cmake | 3 ++- cmake/modules/FindMatrox.cmake | 5 +++-- cmake/modules/FindNIIMAQ.cmake | 5 +++-- cmake/modules/FindNIIMAQdx.cmake | 5 +++-- cmake/modules/FindSapera.cmake | 5 +++-- cmake/modules/FindXCLIB.cmake | 3 ++- 8 files changed, 22 insertions(+), 14 deletions(-) diff --git a/cmake/modules/FindEuresys.cmake b/cmake/modules/FindEuresys.cmake index 68fa574..63e30ce 100644 --- a/cmake/modules/FindEuresys.cmake +++ b/cmake/modules/FindEuresys.cmake @@ -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) \ No newline at end of file +find_package_handle_standard_args (EURESYS DEFAULT_MSG EURESYS_INCLUDE_DIR EURESYS_LIBRARIES) diff --git a/cmake/modules/FindImperx.cmake b/cmake/modules/FindImperx.cmake index 377bd66..d2003a8 100644 --- a/cmake/modules/FindImperx.cmake +++ b/cmake/modules/FindImperx.cmake @@ -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) \ No newline at end of file +find_package_handle_standard_args (IMPERX_FLEX DEFAULT_MSG IMPERX_FLEX_INCLUDE_DIR IMPERX_FLEX_LIBRARIES) diff --git a/cmake/modules/FindImperxSDI.cmake b/cmake/modules/FindImperxSDI.cmake index b285b10..21bc01c 100644 --- a/cmake/modules/FindImperxSDI.cmake +++ b/cmake/modules/FindImperxSDI.cmake @@ -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) diff --git a/cmake/modules/FindMatrox.cmake b/cmake/modules/FindMatrox.cmake index 0dc26fb..179506f 100644 --- a/cmake/modules/FindMatrox.cmake +++ b/cmake/modules/FindMatrox.cmake @@ -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) \ No newline at end of file +find_package_handle_standard_args (MATROX DEFAULT_MSG MATROX_INCLUDE_DIR MATROX_LIBRARIES) diff --git a/cmake/modules/FindNIIMAQ.cmake b/cmake/modules/FindNIIMAQ.cmake index 685c9dc..93179e6 100644 --- a/cmake/modules/FindNIIMAQ.cmake +++ b/cmake/modules/FindNIIMAQ.cmake @@ -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) \ No newline at end of file +mark_as_advanced(NIIMAQ_INCLUDE_DIR NIIMAQ_LIBRARIES) diff --git a/cmake/modules/FindNIIMAQdx.cmake b/cmake/modules/FindNIIMAQdx.cmake index 6a42880..6177cb6 100644 --- a/cmake/modules/FindNIIMAQdx.cmake +++ b/cmake/modules/FindNIIMAQdx.cmake @@ -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) \ No newline at end of file +MARK_AS_ADVANCED(NIIMAQDX_INCLUDE_DIR NIIMAQDX_LIBRARIES) diff --git a/cmake/modules/FindSapera.cmake b/cmake/modules/FindSapera.cmake index 9f88c70..77de12c 100644 --- a/cmake/modules/FindSapera.cmake +++ b/cmake/modules/FindSapera.cmake @@ -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) \ No newline at end of file +find_package_handle_standard_args(SAPERA DEFAULT_MSG SAPERA_INCLUDE_DIR SAPERA_LIBRARIES) diff --git a/cmake/modules/FindXCLIB.cmake b/cmake/modules/FindXCLIB.cmake index daa309f..fa075bd 100644 --- a/cmake/modules/FindXCLIB.cmake +++ b/cmake/modules/FindXCLIB.cmake @@ -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)