]> OCCT Git - occt-copy.git/commitdiff
0028457: OpenCASCADE CMake compile definitions conflict with API of others libraries CR28457
authorski <ski@opencascade.com>
Mon, 28 Aug 2017 08:19:55 +0000 (11:19 +0300)
committerski <ski@opencascade.com>
Mon, 28 Aug 2017 08:19:55 +0000 (11:19 +0300)
Renamed HAVE_* definitions during OCCT installation.

CMakeLists.txt

index 43621df7b6eaafd688685f906a3c0ccfb8607a70..21f795ef772d6c8498c1e33b5c04fddd7980dabd 100644 (file)
@@ -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 $<$<CONFIG:${OCCT_CONFIGURATION}>:${COMPILE_DEFINITION}>)\n")