From 4ea20bea93b05b1f9cab4998626f065c36aa443a Mon Sep 17 00:00:00 2001 From: "Joshua M. Doe" Date: Wed, 21 Oct 2015 08:43:25 -0400 Subject: [PATCH] build: update EDT and Active Silicon Phoenix Find*.cmake to find 32- and 64-bit installations --- cmake/modules/FindEDT.cmake | 52 +++++++++++------------------- cmake/modules/FindPhoenix.cmake | 56 ++++++++++++--------------------- 2 files changed, 39 insertions(+), 69 deletions(-) diff --git a/cmake/modules/FindEDT.cmake b/cmake/modules/FindEDT.cmake index 4534f9f..8c3f7f0 100644 --- a/cmake/modules/FindEDT.cmake +++ b/cmake/modules/FindEDT.cmake @@ -1,49 +1,35 @@ -# - Try to find EDT API +# - Try to find EDT PDV # Once done this will define # -# EDT_FOUND - system has EDT API -# EDT_INCLUDE_DIR - the EDT API include directory -# EDT_LIBRARIES - the libraries needed to use the EDT API +# EDT_FOUND - system has EDT PDV +# EDT_INCLUDE_DIR - the EDT PDV include directory +# EDT_LIBRARIES - the libraries needed to use the EDT PDV # Copyright (c) 2006, Tim Beaulen # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -IF (EDT_INCLUDE_DIR AND EDT_LIBRARIES) - # in cache already - SET(EDT_FIND_QUIETLY TRUE) -ELSE (EDT_INCLUDE_DIR AND EDT_LIBRARIES) - SET(EDT_FIND_QUIETLY FALSE) -ENDIF (EDT_INCLUDE_DIR AND EDT_LIBRARIES) +if (NOT EDT_DIR) + set (EDT_DIR "C:/EDT" CACHE PATH "Directory containing EDT PDV") +endif (NOT EDT_DIR) -IF (NOT EDT_DIR) - SET (EDT_DIR "C:/EDT" CACHE PATH "Directory containing EDT API") -ENDIF (NOT EDT_DIR) - -FIND_PATH (EDT_INCLUDE_DIR edtinc.h +find_path (EDT_INCLUDE_DIR edtinc.h PATHS "${EDT_DIR}/pdv" DOC "Directory containing edtinc.h include file") -FIND_LIBRARY (EDT_LIBRARIES NAMES pdvlib +if (CMAKE_SIZEOF_VOID_P MATCHES "8") +find_library (EDT_LIBRARIES NAMES pdvlib PATHS - "${EDT_DIR}/lib" + "${EDT_DIR}/pdv/lib/amd64" DOC "EDT library to link with") +else () +find_library (EDT_LIBRARIES NAMES pdvlib + PATHS + "${EDT_DIR}/pdv/lib/x86" + DOC "EDT library to link with") +endif () -IF (EDT_INCLUDE_DIR) - #MESSAGE(STATUS "DEBUG: Found Euresys Multicam include dir: ${EDT_INCLUDE_DIR}") -ELSE (EDT_INCLUDE_DIR) - MESSAGE(STATUS "EDT: WARNING: include dir not found") -ENDIF (EDT_INCLUDE_DIR) - -IF (EDT_LIBRARIES) - #MESSAGE(STATUS "DEBUG: Found Euresys Multicam library: ${EDT_LIBRARIES}") -ELSE (EDT_LIBRARIES) - MESSAGE(STATUS "EDT: WARNING: library not found") -ENDIF (EDT_LIBRARIES) - -INCLUDE (FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS (EDT DEFAULT_MSG EDT_INCLUDE_DIR EDT_LIBRARIES) - -MARK_AS_ADVANCED(EDT_INCLUDE_DIR EDT_LIBRARIES) \ No newline at end of file +include (FindPackageHandleStandardArgs) +find_package_handle_standard_args (EDT DEFAULT_MSG EDT_INCLUDE_DIR EDT_LIBRARIES) \ No newline at end of file diff --git a/cmake/modules/FindPhoenix.cmake b/cmake/modules/FindPhoenix.cmake index 07e820a..82238d4 100644 --- a/cmake/modules/FindPhoenix.cmake +++ b/cmake/modules/FindPhoenix.cmake @@ -8,46 +8,30 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# TODO: properly handle 32-/64-bit differences, and Linux +if (NOT PHOENIX_DIR) + message(WARNING "PHOENIX: WARNING: PHOENIX_DIR not set, set to dir SDKX.XX where X.XX is the version") +endif (NOT PHOENIX_DIR) -IF (PHOENIX_INCLUDE_DIR AND PHOENIX_LIBRARIES) - # in cache already - SET(PHOENIX_FIND_QUIETLY TRUE) -ELSE (PHOENIX_INCLUDE_DIR AND PHOENIX_LIBRARIES) - SET(PHOENIX_FIND_QUIETLY FALSE) -ENDIF (PHOENIX_INCLUDE_DIR AND PHOENIX_LIBRARIES) - -IF (NOT PHOENIX_DIR) - SET (PHOENIX_DIR "C:/Program Files (x86)/Active Silicon/Phoenix/Win/SDK5.83" CACHE PATH "Directory containing the Active Silicon Phoenix SDK") -ENDIF (NOT PHOENIX_DIR) - -FIND_PATH (PHOENIX_INCLUDE_DIR phx_api.h +find_path(PHOENIX_INCLUDE_DIR phx_api.h PATHS "${PHOENIX_DIR}/Include" - "C:/Program Files (x86)/Active Silicon/Phoenix/Win/SDK5.83/Include" - "C:/Program Files/Active Silicon/Phoenix/Win/SDK5.83/Include" DOC "Directory containing phx_api.h include file") -FIND_LIBRARY (PHOENIX_LIBRARIES NAMES phxlw32 - PATHS - "${PHOENIX_DIR}/Lib/win32" - "C:/Program Files (x86)/Active Silicon/Phoenix/Win/SDK5.83/Lib/win32" - "C:/Program Files/Active Silicon/Phoenix/Win/SDK5.83/Lib/win32" - DOC "PHOENIX library to link with") +if (CMAKE_SIZEOF_VOID_P MATCHES "8") + find_library(PHOENIX_LIBRARIES NAMES phxlx64 + PATHS + "${PHOENIX_DIR}/Lib/win64" + DOC "PHOENIX library to link with") +elseif () + find_library(PHOENIX_LIBRARIES NAMES phxlw32 + PATHS + "${PHOENIX_DIR}/Lib/win32" + DOC "PHOENIX library to link with") +endif() -IF (PHOENIX_INCLUDE_DIR) - #MESSAGE(STATUS "DEBUG: Found Active Silicon Phoenix include dir: ${PHOENIX_INCLUDE_DIR}") -ELSE (PHOENIX_INCLUDE_DIR) - MESSAGE(STATUS "PHOENIX: WARNING: include dir not found") -ENDIF (PHOENIX_INCLUDE_DIR) +if (NOT PHOENIX_INCLUDE_DIR) + message(WARNING "PHOENIX: WARNING: not found, make sure PHOENIX_DIR is set to dir SDKX.XX") +endif () -IF (PHOENIX_LIBRARIES) - #MESSAGE(STATUS "DEBUG: Found Active Silicon Phoenix library: ${PHOENIX_LIBRARIES}") -ELSE (PHOENIX_LIBRARIES) - MESSAGE(STATUS "PHOENIX: WARNING: library not found") -ENDIF (PHOENIX_LIBRARIES) - -INCLUDE (FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS (PHOENIX DEFAULT_MSG PHOENIX_INCLUDE_DIR PHOENIX_LIBRARIES) - -MARK_AS_ADVANCED(PHOENIX_INCLUDE_DIR PHOENIX_LIBRARIES) \ No newline at end of file +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(PHOENIX DEFAULT_MSG PHOENIX_INCLUDE_DIR PHOENIX_LIBRARIES) \ No newline at end of file