0027176: Configuration, CMake - INSTALL_DIR is a common prefix for all other install...

[occt.git] / adm / cmake / occt_macros.cmake

diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
index f352096..03b778a 100644 (file)
--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@@ -26,6 +26,18 @@ macro (OCCT_CHECK_AND_UNSET_GROUP VARNAME)
   endif()
 endmacro()
 
+macro (OCCT_CHECK_AND_UNSET_INSTALL_DIR_SUBDIRS)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_BIN)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_SCRIPT)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_LIB)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_INCLUDE)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_RESOURCE)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_DATA)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_SAMPLES)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_TESTS)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_DOC)
+endmacro()
+
 # COMPILER_BITNESS variable
 macro (OCCT_MAKE_COMPILER_BITNESS)
   math (EXPR COMPILER_BITNESS "32 + 32*(${CMAKE_SIZEOF_VOID_P}/8)")
@@ -287,7 +299,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
     configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/inc/${HEADER_FILE_NAME}" @ONLY)
   endforeach()
   
-  install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_INCLUDE_DIR}")
+  install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_INCLUDE}")
   
   string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
   message (STATUS "Info: \(${CURRENT_TIME}\) Checking headers in inc folder...")