From 8edd338e20cbf333bc4214e7ff1bd967680b0dd4 Mon Sep 17 00:00:00 2001 From: ski Date: Mon, 28 Aug 2017 11:19:55 +0300 Subject: [PATCH] 0028457: OpenCASCADE CMake compile definitions conflict with API of others libraries Renamed HAVE_* definitions during OCCT installation. --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43621df7b6..21f795ef77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1027,6 +1027,10 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES}) string (TOUPPER "${OCCT_CONFIGURATION}" OCCT_CONFIGURATION_UPPER) string (TOLOWER "${OCCT_CONFIGURATION}" OCCT_CONFIGURATION_LOWER) foreach(COMPILE_DEFINITION ${OCCT_COMPILE_DEFINITIONS}) + string (REGEX MATCH "^HAVE_.+" ISHAVE "${COMPILE_DEFINITION}") + if (ISHAVE) + set (COMPILE_DEFINITION "OPENCASCADE_${COMPILE_DEFINITION}") + endif() string(REPLACE "(" "\\(" COMPILE_DEFINITION "${COMPILE_DEFINITION}") string(REPLACE ")" "\\)" COMPILE_DEFINITION "${COMPILE_DEFINITION}") set (SET_OpenCASCADE_COMPILE_DEFINITIONS "${SET_OpenCASCADE_COMPILE_DEFINITIONS}set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$:${COMPILE_DEFINITION}>)\n") -- 2.39.5