0027514: Configuration, CMake - relative paths are not correctly handled for INSTALL_DIR

Relative path can be used as INSTALL_DIR.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e667562d29e74992aa8f98a1c9c79580fa219c0..eb97189a134d7c2a159b4e531d35db90b8385119 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -287,11 +287,11 @@ endif()
 
 # install LICENSE_LGPL_21.txt and OCCT_LGPL_EXCEPTION.txt files
 if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
-  OCCT_INSTALL_FILE_OR_DIR ("LICENSE_LGPL_21.txt" "${INSTALL_DIR}/${INSTALL_DIR_DOC}")
-  OCCT_INSTALL_FILE_OR_DIR ("OCCT_LGPL_EXCEPTION.txt" "${INSTALL_DIR}/${INSTALL_DIR_DOC}")
+  OCCT_INSTALL_FILE_OR_DIR ("LICENSE_LGPL_21.txt" "${INSTALL_DIR_DOC}")
+  OCCT_INSTALL_FILE_OR_DIR ("OCCT_LGPL_EXCEPTION.txt" "${INSTALL_DIR_DOC}")
 else()
-  OCCT_INSTALL_FILE_OR_DIR ("LICENSE_LGPL_21.txt" "${INSTALL_DIR}")
-  OCCT_INSTALL_FILE_OR_DIR ("OCCT_LGPL_EXCEPTION.txt" "${INSTALL_DIR}")
+  OCCT_INSTALL_FILE_OR_DIR ("LICENSE_LGPL_21.txt" ".")
+  OCCT_INSTALL_FILE_OR_DIR ("OCCT_LGPL_EXCEPTION.txt" ".")
 endif()
 
 if(APPLE)
@@ -584,11 +584,11 @@ if (BUILD_DOC_Overview)
   endif()
 
   if (INSTALL_DOC_Overview)
-    install (DIRECTORY "${CMAKE_BINARY_DIR}/doc/overview" DESTINATION  "${INSTALL_DIR}/${INSTALL_DIR_DOC}")
+    install (DIRECTORY "${CMAKE_BINARY_DIR}/doc/overview" DESTINATION  "${INSTALL_DIR_DOC}")
 
     # create overview.html only for windows
     if (WIN32 AND "${INSTALL_DIR_LAYOUT}" STREQUAL "Windows")
-      OCCT_INSTALL_FILE_OR_DIR ("dox/resources/overview.html" "${INSTALL_DIR}/${INSTALL_DIR_DOC}/..")
+      OCCT_INSTALL_FILE_OR_DIR ("dox/resources/overview.html" "${INSTALL_DIR_DOC}/..")
     endif()
   endif()
 
@@ -675,6 +675,12 @@ COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}" "${BUILD_TOOLKITS}"
 string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
 message (STATUS "Info: \(${CURRENT_TIME}\) End the collecting")
 
+list (FIND BUILD_TOOLKITS DRAWEXE DRAWEXE_INDEX)
+if (${DRAWEXE_INDEX} GREATER -1)
+  OCCT_INSTALL_FILE_OR_DIR ("data/" "${INSTALL_DIR_DATA}")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/tcl" "${INSTALL_DIR_SAMPLES}")
+endif()
+
 if (WIN32)
   set (SCRIPT_EXT bat)
 else()
@@ -682,45 +688,51 @@ else()
 endif()
 
 # OCCT samples
+# get absolute path from INSTALL_DIR
+set (INSTALL_DIR_ABSOLUTE "${INSTALL_DIR}")
+if(NOT IS_ABSOLUTE "${INSTALL_DIR_ABSOLUTE}")
+  get_filename_component(INSTALL_DIR_ABSOLUTE "${CMAKE_BINARY_DIR}/${INSTALL_DIR}" ABSOLUTE)
+endif()
+
 if (INSTALL_SAMPLES)
   OCCT_CONFIGURE ("adm/templates/env.samples.${SCRIPT_EXT}.in" "env.samples.${SCRIPT_EXT}")
   if (WIN32)
-    OCCT_INSTALL_FILE_OR_DIR ("samples/CSharp" "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}")
-    OCCT_INSTALL_FILE_OR_DIR ("samples/mfc" "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}")
+    OCCT_INSTALL_FILE_OR_DIR ("samples/CSharp" "${INSTALL_DIR_SAMPLES}")
+    OCCT_INSTALL_FILE_OR_DIR ("samples/mfc" "${INSTALL_DIR_SAMPLES}")
 
     if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
-      OCCT_INSTALL_FILE_OR_DIR ("samples/xaml" "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}")
+      OCCT_INSTALL_FILE_OR_DIR ("samples/xaml" "${INSTALL_DIR_SAMPLES}")
     endif()
 
-    install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}/CSharp" RENAME "env.${SCRIPT_EXT}")
-    install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}/mfc/standard" RENAME "env.${SCRIPT_EXT}")
+    install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/CSharp" RENAME "env.${SCRIPT_EXT}")
+    install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/mfc/standard" RENAME "env.${SCRIPT_EXT}")
   endif()
 
-  OCCT_INSTALL_FILE_OR_DIR ("samples/java" "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}")
-  OCCT_INSTALL_FILE_OR_DIR ("samples/ocafsamples" "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}")
-  OCCT_INSTALL_FILE_OR_DIR ("samples/qt" "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/java" "${INSTALL_DIR_SAMPLES}")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/ocafsamples" "${INSTALL_DIR_SAMPLES}")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/qt" "${INSTALL_DIR_SAMPLES}")
 
-  install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}/qt/FuncDemo" RENAME "env.${SCRIPT_EXT}")
-  install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}/qt/IESample" RENAME "env.${SCRIPT_EXT}")
-  install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}/qt/Tutorial" RENAME "env.${SCRIPT_EXT}")
+  install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/qt/FuncDemo" RENAME "env.${SCRIPT_EXT}")
+  install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/qt/IESample" RENAME "env.${SCRIPT_EXT}")
+  install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/qt/Tutorial" RENAME "env.${SCRIPT_EXT}")
 endif()
 
 if (INSTALL_TEST_CASES)
-  OCCT_INSTALL_FILE_OR_DIR ("tests/" "${INSTALL_DIR}/${INSTALL_DIR_TESTS}")
+  OCCT_INSTALL_FILE_OR_DIR ("tests/" "${INSTALL_DIR_TESTS}")
 endif()
 
 list (FIND BUILD_TOOLKITS DRAWEXE DRAWEXE_INDEX)
 if (${DRAWEXE_INDEX} GREATER -1)
   # copy data and samples/tcl folders to install script folder
-  OCCT_INSTALL_FILE_OR_DIR ("data/" "${INSTALL_DIR}/${INSTALL_DIR_DATA}")
-  OCCT_INSTALL_FILE_OR_DIR ("samples/tcl" "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}")
+  OCCT_INSTALL_FILE_OR_DIR ("data/" "${INSTALL_DIR_DATA}")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/tcl" "${INSTALL_DIR_SAMPLES}")
 
   # copy draw script to install script folder
   if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}")
-    install (FILES "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}"
+    install (FILES "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR_SCRIPT}"
             PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
   else()
-    install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}"
+    install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR_SCRIPT}"
             PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
   endif()
 
@@ -744,18 +756,18 @@ if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
 
   file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
 else()
-  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}")
+  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
 endif()
 
 # write current custom.bat/sh (for install directory)
 set (SUB_CUSTOM_BUILD_NAME "custom_${COMPILER}_${COMPILER_BITNESS}.install.${SCRIPT_EXT}")
-OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.install.${SCRIPT_EXT}.in" "${SUB_CUSTOM_BUILD_NAME}" "${SUB_CUSTOM_NAME}" "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}")
+OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.install.${SCRIPT_EXT}.in" "${SUB_CUSTOM_BUILD_NAME}" "${SUB_CUSTOM_NAME}" "${INSTALL_DIR_SCRIPT}")
 
 # write current custom.bat/sh (for build directory)
 OCCT_CONFIGURE ("adm/templates/custom.build.${SCRIPT_EXT}.in" "${SUB_CUSTOM_NAME}")
 
 if (BUILD_MODULE_MfcSamples)
-  OCCT_INSTALL_FILE_OR_DIR ("adm/templates/sample.bat" "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}")
+  OCCT_INSTALL_FILE_OR_DIR ("adm/templates/sample.bat" "${INSTALL_DIR_SCRIPT}")
   OCCT_COPY_FILE_OR_DIR    ("adm/templates/sample.bat" "${CMAKE_BINARY_DIR}")
 endif()
 
@@ -763,7 +775,7 @@ endif()
 OCCT_CONFIGURE ("adm/templates/env.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}")
 
 # install env script
-install (FILES "${CMAKE_BINARY_DIR}/env.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}")
+install (FILES "${CMAKE_BINARY_DIR}/env.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}")
 
 # copy DrawAppliInit from OCCT source to build directory
 if (NOT EXISTS "${CMAKE_BINARY_DIR}/DrawAppliInit")
@@ -776,9 +788,9 @@ foreach(RESOURCE ${RESOURCES})
   get_filename_component(RESOURCE_FOLDER ${RESOURCE} DIRECTORY)
   if(NOT "${RESOURCE_FOLDER}" STREQUAL "")
     get_filename_component(RESOURCE_FOLDER ${RESOURCE_FOLDER} NAME)
-    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR}/${INSTALL_DIR_RESOURCE}/${RESOURCE_FOLDER}")
+    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR_RESOURCE}/${RESOURCE_FOLDER}")
   else()
-    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR}/${INSTALL_DIR_RESOURCE}")
+    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR_RESOURCE}")
   endif()
 endforeach()
 
@@ -933,7 +945,7 @@ endif()
 
 # Configure and install cmake config file
 configure_file("${CMAKE_SOURCE_DIR}/adm/templates/OpenCASCADEConfig.cmake.in" "OpenCASCADEConfig.cmake" @ONLY)
-install(FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfig.cmake" DESTINATION  "${INSTALL_DIR}/${INSTALL_DIR_CMAKE}")
+install(FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfig.cmake" DESTINATION  "${INSTALL_DIR_CMAKE}")
 
 # Configure cmake version file
 include(CMakePackageConfigHelpers)
@@ -942,7 +954,7 @@ write_basic_package_version_file( ${CMAKE_BINARY_DIR}/OpenCASCADEConfigVersion.c
                                   COMPATIBILITY ExactVersion )
 
 # Install cmake version file
-install (FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfigVersion.cmake" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_CMAKE}")
+install (FILES "${CMAKE_BINARY_DIR}/OpenCASCADEConfigVersion.cmake" DESTINATION "${INSTALL_DIR_CMAKE}")
 
 # Install the export set for use with the install-tree for each configuration
 foreach (OCCT_MODULE ${OCCT_MODULES_ENABLED})

diff --git a/adm/cmake/3rdparty_macro.cmake b/adm/cmake/3rdparty_macro.cmake
index e77378289dd375be271516dcc3408891686a24c5..a9a8c230e27301f15de9e8c83f2f23d0cee2d4cc 100644 (file)
--- a/adm/cmake/3rdparty_macro.cmake
+++ b/adm/cmake/3rdparty_macro.cmake
@@ -196,17 +196,17 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME LIBRARY_NAME_DEB
 
       if (WIN32)
         if (SINGLE_GENERATOR)
-          install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+          install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" DESTINATION "${INSTALL_DIR_BIN}")
         else()
           install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}"
                    CONFIGURATIONS Release
-                   DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+                   DESTINATION "${INSTALL_DIR_BIN}")
           install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}"
                    CONFIGURATIONS RelWithDebInfo
-                   DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}i")
+                   DESTINATION "${INSTALL_DIR_BIN}i")
           install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}"
                    CONFIGURATIONS Debug
-                   DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+                   DESTINATION "${INSTALL_DIR_BIN}d")
         endif()
       else()
         get_filename_component(ABS_PATH ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} REALPATH)
@@ -215,19 +215,19 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME LIBRARY_NAME_DEB
           get_filename_component(FREEIMLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} NAME)
 
           if (SINGLE_GENERATOR)
-            install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}" RENAME ${FREEIMLIB}.3)
+            install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR_LIB}" RENAME ${FREEIMLIB}.3)
           else()
             install (FILES "${ABS_PATH}"
                      CONFIGURATIONS Release
-                     DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
+                     DESTINATION "${INSTALL_DIR_LIB}"
                      RENAME ${FREEIMLIB}.3)
             install (FILES "${ABS_PATH}"
                      CONFIGURATIONS RelWithDebInfo
-                     DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}i"
+                     DESTINATION "${INSTALL_DIR_LIB}i"
                      RENAME ${FREEIMLIB}.3)
             install (FILES "${ABS_PATH}"
                      CONFIGURATIONS Debug
-                     DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d"
+                     DESTINATION "${INSTALL_DIR_LIB}d"
                      RENAME ${FREEIMLIB}.3)
           endif()
         endif()
@@ -236,19 +236,19 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME LIBRARY_NAME_DEB
           get_filename_component(GL2PSLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} NAME)
 
           if (SINGLE_GENERATOR)
-            install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}" RENAME ${GL2PSLIB}.1)
+            install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR_LIB}" RENAME ${GL2PSLIB}.1)
           else()
             install (FILES "${ABS_PATH}"
                      CONFIGURATIONS Release
-                     DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
+                     DESTINATION "${INSTALL_DIR_LIB}"
                      RENAME ${GL2PSLIB}.1)
             install (FILES "${ABS_PATH}"
                      CONFIGURATIONS RelWithDebInfo
-                     DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}i"
+                     DESTINATION "${INSTALL_DIR_LIB}i"
                      RENAME ${GL2PSLIB}.1)
             install (FILES "${ABS_PATH}"
                      CONFIGURATIONS Debug
-                     DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d"
+                     DESTINATION "${INSTALL_DIR_LIB}d"
                      RENAME ${GL2PSLIB}.1)
           endif()
         endif()

diff --git a/adm/cmake/freetype.cmake b/adm/cmake/freetype.cmake
index f3bc8df5a32a24be3c745a8465d1df10de196b24..b348573ef1dfe8e68ff25f0479a9b1717462a09e 100644 (file)
--- a/adm/cmake/freetype.cmake
+++ b/adm/cmake/freetype.cmake
@@ -300,17 +300,17 @@ if (BUILD_SHARED_LIBS)
 
     if (WIN32)
       if (SINGLE_GENERATOR)
-        install (FILES "${3RDPARTY_FREETYPE_DLL}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+        install (FILES "${3RDPARTY_FREETYPE_DLL}" DESTINATION "${INSTALL_DIR_BIN}")
       else()
         install (FILES "${3RDPARTY_FREETYPE_DLL}"
                  CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+                 DESTINATION "${INSTALL_DIR_BIN}")
         install (FILES "${3RDPARTY_FREETYPE_DLL}"
                  CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}i")
+                 DESTINATION "${INSTALL_DIR_BIN}i")
         install (FILES "${3RDPARTY_FREETYPE_DLL}"
                  CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+                 DESTINATION "${INSTALL_DIR_BIN}d")
       endif()
     else()
       get_filename_component(3RDPARTY_FREETYPE_LIBRARY_ABS ${3RDPARTY_FREETYPE_LIBRARY} REALPATH)
@@ -318,20 +318,20 @@ if (BUILD_SHARED_LIBS)
 
       if (SINGLE_GENERATOR)
         install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
+                 DESTINATION "${INSTALL_DIR_LIB}"
                  RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
       else()
         install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
                  CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
+                 DESTINATION "${INSTALL_DIR_LIB}"
                  RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
         install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
                  CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}i"
+                 DESTINATION "${INSTALL_DIR_LIB}i"
                  RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
         install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
                  CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d"
+                 DESTINATION "${INSTALL_DIR_LIB}d"
                  RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
       endif()
     endif()

diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
index 057cac0acf34b212248145040fa5c701161db572..7a3bd0bc6c2f0ef2fc50443bc62294c1f5ff2a9b 100644 (file)
--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@@ -299,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_DIR}/${INSTALL_DIR_INCLUDE}")
+  install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_DIR_INCLUDE}")
   
   string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
   message (STATUS "Info: \(${CURRENT_TIME}\) Checking headers in inc folder...")

diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
index d707d015e8db97b03da39e5ad207a2cd4de4d53a..14acf42e868311c513473134b3a2c632d0e5833d 100644 (file)
--- a/adm/cmake/occt_toolkit.cmake
+++ b/adm/cmake/occt_toolkit.cmake
@@ -147,14 +147,14 @@ if ("${PROJECT_NAME}" STREQUAL "DRAWEXE")
   add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE})
 
   install (TARGETS ${PROJECT_NAME}
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
+           DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
 else()
   add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE})
 
   if (MSVC)
     install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind/${PROJECT_NAME}.pdb
              CONFIGURATIONS Debug
-             DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
+             DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
   endif()
 
   if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")

diff --git a/adm/cmake/tbb.cmake b/adm/cmake/tbb.cmake
index 4a6c396f02cb2c742db63d5338bfd81cacd606d9..61873967a3e2d7165594c30665eeaa1d067e03c5 100644 (file)
--- a/adm/cmake/tbb.cmake
+++ b/adm/cmake/tbb.cmake
@@ -237,37 +237,37 @@ macro (TBB_PRODUCT_SEARCH PRODUCT_NAME)
 
     if (WIN32)
       if (SINGLE_GENERATOR)
-        install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL} DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+        install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL} DESTINATION "${INSTALL_DIR_BIN}")
       else()
         install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL}
                  CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+                 DESTINATION "${INSTALL_DIR_BIN}")
         install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL}
                  CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}i")
+                 DESTINATION "${INSTALL_DIR_BIN}i")
         install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL}
                  CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+                 DESTINATION "${INSTALL_DIR_BIN}d")
       endif()
     else()
       get_filename_component (PRODUCT_LIBRARY_NAME ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} NAME)
 
       if (SINGLE_GENERATOR)
         install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
+                 DESTINATION "${INSTALL_DIR_LIB}"
                  RENAME ${PRODUCT_LIBRARY_NAME}.2)
       else()
         install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
                  CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
+                 DESTINATION "${INSTALL_DIR_LIB}"
                  RENAME ${PRODUCT_LIBRARY_NAME}.2)
         install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
                  CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}i"
+                 DESTINATION "${INSTALL_DIR_LIB}i"
                  RENAME ${PRODUCT_LIBRARY_NAME}.2)
         install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
                  CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d"
+                 DESTINATION "${INSTALL_DIR_LIB}d"
                  RENAME ${PRODUCT_LIBRARY_NAME}.2)
       endif()
     endif()

diff --git a/adm/cmake/tcl.cmake b/adm/cmake/tcl.cmake
index 5bed15eec0588bdbb7ab8dfc96a12fd08b68ec86..2ce3eef34f5ed65d4984e221996edb58c1c71c69 100644 (file)
--- a/adm/cmake/tcl.cmake
+++ b/adm/cmake/tcl.cmake
@@ -210,40 +210,40 @@ if (BUILD_SHARED_LIBS)
       file (GLOB TCL_DLLS "${3RDPARTY_TCL_DLL_DIR}/*.dll")
 
       if (SINGLE_GENERATOR)
-        install (FILES ${TCL_DLLS} DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+        install (FILES ${TCL_DLLS} DESTINATION "${INSTALL_DIR_BIN}")
       else()
         install (FILES ${TCL_DLLS}
                  CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+                 DESTINATION "${INSTALL_DIR_BIN}")
         install (FILES ${TCL_DLLS}
                  CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}i")
+                 DESTINATION "${INSTALL_DIR_BIN}i")
         install (FILES ${TCL_DLLS}
                  CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+                 DESTINATION "${INSTALL_DIR_BIN}d")
       endif()
     else()
       get_filename_component(3RDPARTY_TCL_LIBRARY_REALPATH ${3RDPARTY_TCL_LIBRARY} REALPATH)
 
       if (SINGLE_GENERATOR)
-        install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
+        install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR_LIB}")
       else()
         install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
                  CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
+                 DESTINATION "${INSTALL_DIR_LIB}")
         install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
                  CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}i")
+                 DESTINATION "${INSTALL_DIR_LIB}i")
         install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
                  CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d")
+                 DESTINATION "${INSTALL_DIR_LIB}d")
       endif()
     endif()
 
     if (TCL_TCLSH_VERSION)
       # tcl is required to install in lib folder (without)
-      install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl8"                    DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
-      install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl${TCL_TCLSH_VERSION}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
+      install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl8"                    DESTINATION "${INSTALL_DIR_LIB}")
+      install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl${TCL_TCLSH_VERSION}" DESTINATION "${INSTALL_DIR_LIB}")
     else()
       message (STATUS "\nWarning: tclX.X subdir won't be copyied during the installation process.")
       message (STATUS "Try seeking tcl within another folder by changing 3RDPARTY_TCL_DIR variable.")

diff --git a/adm/cmake/tk.cmake b/adm/cmake/tk.cmake
index 09f2f23c274674307a769497b5eec576840a5cde..892e5667bba04df23281a14651f8c9099e2bb053 100644 (file)
--- a/adm/cmake/tk.cmake
+++ b/adm/cmake/tk.cmake
@@ -216,39 +216,39 @@ if (BUILD_SHARED_LIBS)
       file (GLOB TK_DLLS  "${3RDPARTY_TK_DLL_DIR}/*.dll")
 
       if (SINGLE_GENERATOR)
-        install (FILES ${TK_DLLS} DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+        install (FILES ${TK_DLLS} DESTINATION "${INSTALL_DIR_BIN}")
       else()
         install (FILES ${TK_DLLS}
                  CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+                 DESTINATION "${INSTALL_DIR_BIN}")
         install (FILES ${TK_DLLS}
                  CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}i")
+                 DESTINATION "${INSTALL_DIR_BIN}i")
         install (FILES ${TK_DLLS}
                  CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+                 DESTINATION "${INSTALL_DIR_BIN}d")
       endif()
     else()
       get_filename_component(3RDPARTY_TK_LIBRARY_REALPATH ${3RDPARTY_TK_LIBRARY} REALPATH)
 
       if (SINGLE_GENERATOR)
-        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
+        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR_LIB}")
       else()
         install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
                  CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}/")
+                 DESTINATION "${INSTALL_DIR_LIB}/")
         install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
                  CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}/i")
+                 DESTINATION "${INSTALL_DIR_LIB}/i")
         install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
                  CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d")
+                 DESTINATION "${INSTALL_DIR_LIB}d")
       endif()
     endif()
 
     if (TCL_TCLSH_VERSION)
       # tk is required to install in lib folder (without)
-      install (DIRECTORY "${3RDPARTY_TK_LIBRARY_DIR}/tk${TCL_TCLSH_VERSION}"  DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
+      install (DIRECTORY "${3RDPARTY_TK_LIBRARY_DIR}/tk${TCL_TCLSH_VERSION}"  DESTINATION "${INSTALL_DIR_LIB}")
     else()
       message (STATUS "\nWarning: tkX.X subdir won't be copyied during the installation process.")
       message (STATUS "Try seeking tk within another folder by changing 3RDPARTY_TK_DIR variable.")

diff --git a/adm/templates/custom.install.bat.in b/adm/templates/custom.install.bat.in
index 4fb05ac4204702fe260fd38c18a463227d8818b8..7ddd9d42d5a5063d15bf714151d8dbdc98500716 100644 (file)
--- a/adm/templates/custom.install.bat.in
+++ b/adm/templates/custom.install.bat.in
@@ -17,18 +17,18 @@ if /I "%VCVER%" == "@COMPILER@" (
     set "TCL_VERSION_WITH_DOT=@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
     set "TK_VERSION_WITH_DOT=@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
 
-    set "CSF_OCCTBinPath=@INSTALL_DIR@/@INSTALL_DIR_BIN@%3"
-    set "CSF_OCCTLibPath=@INSTALL_DIR@/@INSTALL_DIR_LIB@%3"
+    set "CSF_OCCTBinPath=@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_BIN@%3"
+    set "CSF_OCCTLibPath=@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_LIB@%3"
 
-    set "CSF_OCCTIncludePath=@INSTALL_DIR@/@INSTALL_DIR_INCLUDE@"
-    set "CSF_OCCTResourcePath=@INSTALL_DIR@/@INSTALL_DIR_RESOURCE@"
-    set "CSF_OCCTDataPath=@INSTALL_DIR@/@INSTALL_DIR_DATA@"
-    set "CSF_OCCTSamplesPath=@INSTALL_DIR@/@INSTALL_DIR_SAMPLES@"
-    set "CSF_OCCTTestsPath=@INSTALL_DIR@/@INSTALL_DIR_TESTS@"
-    set "CSF_OCCTDocPath=@INSTALL_DIR@/@INSTALL_DIR_DOC@"
+    set "CSF_OCCTIncludePath=@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_INCLUDE@"
+    set "CSF_OCCTResourcePath=@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_RESOURCE@"
+    set "CSF_OCCTDataPath=@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_DATA@"
+    set "CSF_OCCTSamplesPath=@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_SAMPLES@"
+    set "CSF_OCCTTestsPath=@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_TESTS@"
+    set "CSF_OCCTDocPath=@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_DOC@"
 
     rem for compatability with external application using CASROOT
-    set "CASROOT=@INSTALL_DIR@"
+    set "CASROOT=@INSTALL_DIR_ABSOLUTE@"
   )
 )
 

diff --git a/adm/templates/custom.install.sh.in b/adm/templates/custom.install.sh.in
index 6edc6438432b201e9b643cde0009bb3b7f86f189..4a8a8e7c32199fd41c9a69ac79207d58e168dfe4 100644 (file)
--- a/adm/templates/custom.install.sh.in
+++ b/adm/templates/custom.install.sh.in
@@ -13,17 +13,17 @@ if [ "$1" == "@BIN_LETTER@" ]; then
     export TCL_VERSION_WITH_DOT="@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
     export TK_VERSION_WITH_DOT="@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
 
-    export CSF_OCCTBinPath="@INSTALL_DIR@/@INSTALL_DIR_BIN@"
-    export CSF_OCCTLibPath="@INSTALL_DIR@/@INSTALL_DIR_LIB@"
-    export CSF_OCCTIncludePath="@INSTALL_DIR@/@INSTALL_DIR_INCLUDE@"
-    export CSF_OCCTResourcePath="@INSTALL_DIR@/@INSTALL_DIR_RESOURCE@"
-    export CSF_OCCTDataPath="@INSTALL_DIR@/@INSTALL_DIR_DATA@"
-    export CSF_OCCTSamplesPath="@INSTALL_DIR@/@INSTALL_DIR_SAMPLES@"
-    export CSF_OCCTTestsPath="@INSTALL_DIR@/@INSTALL_DIR_TESTS@"
-    export CSF_OCCTDocPath="@INSTALL_DIR@/@INSTALL_DIR_DOC@"
+    export CSF_OCCTBinPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_BIN@"
+    export CSF_OCCTLibPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_LIB@"
+    export CSF_OCCTIncludePath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_INCLUDE@"
+    export CSF_OCCTResourcePath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_RESOURCE@"
+    export CSF_OCCTDataPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_DATA@"
+    export CSF_OCCTSamplesPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_SAMPLES@"
+    export CSF_OCCTTestsPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_TESTS@"
+    export CSF_OCCTDocPath="@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_DOC@"
     
     # for compatability with external application using CASROOT
-    export CASROOT="@INSTALL_DIR@"
+    export CASROOT="@INSTALL_DIR_ABSOLUTE@"
   fi
 fi
 

diff --git a/adm/templates/env.samples.bat.in b/adm/templates/env.samples.bat.in
index ef3db43aa993a33954f7a762c460265106c9a07b..ed3737db798e63ff14a8e720439bf63e7141711b 100644 (file)
--- a/adm/templates/env.samples.bat.in
+++ b/adm/templates/env.samples.bat.in
@@ -4,7 +4,7 @@ if exist "%~dp0custom.bat" (
   call "%~dp0custom.bat" %1 %2 %3
 )
 
-call "@INSTALL_DIR@\@INSTALL_DIR_SCRIPT@\env.bat" %1 %2 %3
+call "@INSTALL_DIR_ABSOLUTE@\@INSTALL_DIR_SCRIPT@\env.bat" %1 %2 %3
 
 set "BIN_DIR=win%ARCH%\%VCVER%\bind"
 set "LIB_DIR=win%ARCH%\%VCVER%\libd"

diff --git a/adm/templates/env.samples.sh.in b/adm/templates/env.samples.sh.in
index 51ae3d5a5a3c003371be1a1bc83553a301031dfb..d497aad35d69d74169d08d338cddffb1ebba2723 100644 (file)
--- a/adm/templates/env.samples.sh.in
+++ b/adm/templates/env.samples.sh.in
@@ -6,8 +6,8 @@ if [ -e "custom.sh" ]; then
    source "custom.sh";
 fi
 
-if [ -e "@INSTALL_DIR@/@INSTALL_DIR_SCRIPT@/env.sh" ]; then
-   source "@INSTALL_DIR@/@INSTALL_DIR_SCRIPT@/env.sh";
+if [ -e "@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_SCRIPT@/env.sh" ]; then
+   source "@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_SCRIPT@/env.sh";
 fi
 
 if test "${QTDIR}" == ""; then

diff --git a/samples/mfc/standard/01_Geometry/CMakeLists.txt b/samples/mfc/standard/01_Geometry/CMakeLists.txt
index d83cfaec9b5d38f89ba37f6b513a75a40d2b8146..b7365dac7d7521c2d22f80ee1cea384e9348d644 100644 (file)
--- a/samples/mfc/standard/01_Geometry/CMakeLists.txt
+++ b/samples/mfc/standard/01_Geometry/CMakeLists.txt
@@ -70,14 +70,14 @@ add_executable (Geometry WIN32 ${Geometry_SOURCE_FILES}
 set_property(TARGET Geometry PROPERTY FOLDER Samples)
 
 if (SINGLE_GENERATOR)
-  install (TARGETS Geometry DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS Geometry DESTINATION "${INSTALL_DIR_BIN}")
 else()
   install (TARGETS Geometry
            CONFIGURATIONS Release RelWithDebInfo
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+           DESTINATION "${INSTALL_DIR_BIN}")
   install (TARGETS Geometry
            CONFIGURATIONS Debug
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+           DESTINATION "${INSTALL_DIR_BIN}d")
 endif()
 
 include_directories (${CMAKE_BINARY_DIR}/inc

diff --git a/samples/mfc/standard/02_Modeling/CMakeLists.txt b/samples/mfc/standard/02_Modeling/CMakeLists.txt
index b9867051d17f898f7be2916896b89a5cb41c2415..1b0b3ff2f55cc2ff59070064951901f7793c644a 100644 (file)
--- a/samples/mfc/standard/02_Modeling/CMakeLists.txt
+++ b/samples/mfc/standard/02_Modeling/CMakeLists.txt
@@ -40,14 +40,14 @@ add_executable ( Modeling WIN32 ${Modeling_SOURCE_FILES}
 set_property (TARGET Modeling PROPERTY FOLDER Samples)
 
 if (SINGLE_GENERATOR)
-  install (TARGETS Modeling DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS Modeling DESTINATION "${INSTALL_DIR_BIN}")
 else()
   install (TARGETS Modeling
            CONFIGURATIONS Release RelWithDebInfo
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+           DESTINATION "${INSTALL_DIR_BIN}")
   install (TARGETS Modeling
            CONFIGURATIONS Debug
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+           DESTINATION "${INSTALL_DIR_BIN}d")
 endif()
 
 include_directories (${CMAKE_BINARY_DIR}/inc

diff --git a/samples/mfc/standard/03_Viewer2d/CMakeLists.txt b/samples/mfc/standard/03_Viewer2d/CMakeLists.txt
index e295bbd98ef20cd17189dece8374ed6feb5856dd..c1aaee7cb50f90d6dbad9bca10a95a9dadbd016b 100644 (file)
--- a/samples/mfc/standard/03_Viewer2d/CMakeLists.txt
+++ b/samples/mfc/standard/03_Viewer2d/CMakeLists.txt
@@ -36,14 +36,14 @@ add_executable (Viewer2d WIN32 ${Viewer2d_SOURCE_FILES}
 set_property (TARGET Viewer2d PROPERTY FOLDER Samples)
 
 if (SINGLE_GENERATOR)
-  install (TARGETS Viewer2d DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS Viewer2d DESTINATION "${INSTALL_DIR_BIN}")
 else()
   install (TARGETS Viewer2d
            CONFIGURATIONS Release RelWithDebInfo
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+           DESTINATION "${INSTALL_DIR_BIN}")
   install (TARGETS Viewer2d
            CONFIGURATIONS Debug
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+           DESTINATION "${INSTALL_DIR_BIN}d")
 endif()
 
 include_directories (${CMAKE_BINARY_DIR}/inc

diff --git a/samples/mfc/standard/04_Viewer3d/CMakeLists.txt b/samples/mfc/standard/04_Viewer3d/CMakeLists.txt
index 3c39f057d1eb4f419b2c6be1055d0a86e820a479..1b0d219fad2220cfa8cfd685e32575b566c6e94a 100644 (file)
--- a/samples/mfc/standard/04_Viewer3d/CMakeLists.txt
+++ b/samples/mfc/standard/04_Viewer3d/CMakeLists.txt
@@ -60,14 +60,14 @@ add_executable (Viewer3d WIN32 ${Viewer3d_SOURCE_FILES}
 set_property (TARGET Viewer3d PROPERTY FOLDER Samples)
 
 if (SINGLE_GENERATOR)
-  install (TARGETS Viewer3d DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS Viewer3d DESTINATION "${INSTALL_DIR_BIN}")
 else()
   install (TARGETS Viewer3d
            CONFIGURATIONS Release RelWithDebInfo
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+           DESTINATION "${INSTALL_DIR_BIN}")
   install (TARGETS Viewer3d
            CONFIGURATIONS Debug
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+           DESTINATION "${INSTALL_DIR_BIN}d")
 endif()
 
 include_directories (${CMAKE_BINARY_DIR}/inc

diff --git a/samples/mfc/standard/05_ImportExport/CMakeLists.txt b/samples/mfc/standard/05_ImportExport/CMakeLists.txt
index 5970b168f003083069c1550477f2eb447205e051..93af4ff124c634167958f48efbb448160d556537 100644 (file)
--- a/samples/mfc/standard/05_ImportExport/CMakeLists.txt
+++ b/samples/mfc/standard/05_ImportExport/CMakeLists.txt
@@ -38,14 +38,14 @@ add_executable (ImportExport WIN32 ${ImportExport_SOURCE_FILES}
 set_property (TARGET ImportExport PROPERTY FOLDER Samples)
 
 if (SINGLE_GENERATOR)
-  install (TARGETS ImportExport DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS ImportExport DESTINATION "${INSTALL_DIR_BIN}")
 else()
   install (TARGETS ImportExport
            CONFIGURATIONS Release RelWithDebInfo
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+           DESTINATION "${INSTALL_DIR_BIN}")
   install (TARGETS ImportExport
            CONFIGURATIONS Debug
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+           DESTINATION "${INSTALL_DIR_BIN}d")
 endif()
 
 include_directories (${CMAKE_BINARY_DIR}/inc

diff --git a/samples/mfc/standard/06_Ocaf/CMakeLists.txt b/samples/mfc/standard/06_Ocaf/CMakeLists.txt
index 17e3b8b4f8e30fb9558e2433726197598c7e3b23..eb2c5001acbdc2b0bfa0d539d5aec539be895c2e 100644 (file)
--- a/samples/mfc/standard/06_Ocaf/CMakeLists.txt
+++ b/samples/mfc/standard/06_Ocaf/CMakeLists.txt
@@ -52,14 +52,14 @@ add_executable (Ocaf WIN32 ${Ocaf_SOURCE_FILES}
 set_property (TARGET Ocaf PROPERTY FOLDER Samples)
 
 if (SINGLE_GENERATOR)
-  install (TARGETS Ocaf DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS Ocaf DESTINATION "${INSTALL_DIR_BIN}")
 else()
   install (TARGETS Ocaf
            CONFIGURATIONS Release RelWithDebInfo
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+           DESTINATION "${INSTALL_DIR_BIN}")
   install (TARGETS Ocaf
            CONFIGURATIONS Debug
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+           DESTINATION "${INSTALL_DIR_BIN}d")
 endif()
 
 include_directories (${CMAKE_BINARY_DIR}/inc

diff --git a/samples/mfc/standard/07_Triangulation/CMakeLists.txt b/samples/mfc/standard/07_Triangulation/CMakeLists.txt
index 07fa98d71a437dfff31c00a3cbbab8a2838d9c9a..0e1229f0f57450eeeb9f726a4419659065a0623f 100644 (file)
--- a/samples/mfc/standard/07_Triangulation/CMakeLists.txt
+++ b/samples/mfc/standard/07_Triangulation/CMakeLists.txt
@@ -42,14 +42,14 @@ add_executable (Triangulation WIN32 ${Triangulation_SOURCE_FILES}
 set_property (TARGET Triangulation PROPERTY FOLDER Samples)
 
 if (SINGLE_GENERATOR)
-  install (TARGETS Triangulation DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS Triangulation DESTINATION "${INSTALL_DIR_BIN}")
 else()
   install (TARGETS Triangulation
            CONFIGURATIONS Release RelWithDebInfo
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+           DESTINATION "${INSTALL_DIR_BIN}")
   install (TARGETS Triangulation
            CONFIGURATIONS Debug
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+           DESTINATION "${INSTALL_DIR_BIN}d")
 endif()
 
 include_directories (${CMAKE_BINARY_DIR}/inc

diff --git a/samples/mfc/standard/08_HLR/CMakeLists.txt b/samples/mfc/standard/08_HLR/CMakeLists.txt
index e774bdb6dba5049e5123e3b48d98defbe7594df2..97a35401ee6c51961bf0359ea6b385a637f02714 100644 (file)
--- a/samples/mfc/standard/08_HLR/CMakeLists.txt
+++ b/samples/mfc/standard/08_HLR/CMakeLists.txt
@@ -64,14 +64,14 @@ add_executable (HLR WIN32 ${HLR_SOURCE_FILES}
 set_property (TARGET HLR PROPERTY FOLDER Samples)
 
 if (SINGLE_GENERATOR)
-  install (TARGETS HLR DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS HLR DESTINATION "${INSTALL_DIR_BIN}")
 else()
   install (TARGETS HLR
            CONFIGURATIONS Release RelWithDebInfo
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+           DESTINATION "${INSTALL_DIR_BIN}")
   install (TARGETS HLR
            CONFIGURATIONS Debug
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+           DESTINATION "${INSTALL_DIR_BIN}d")
 endif()
 
 include_directories (${CMAKE_BINARY_DIR}/inc

diff --git a/samples/mfc/standard/09_Animation/CMakeLists.txt b/samples/mfc/standard/09_Animation/CMakeLists.txt
index 5df52e6d5fa7dfef8faf00d8d7bf8f071dfe9af7..0c6bfa5b0aaf423d5bfb4d778b24c2d74c301a14 100644 (file)
--- a/samples/mfc/standard/09_Animation/CMakeLists.txt
+++ b/samples/mfc/standard/09_Animation/CMakeLists.txt
@@ -47,14 +47,14 @@ add_executable (Animation WIN32 ${Animation_SOURCE_FILES}
 set_property (TARGET Animation PROPERTY FOLDER Samples)
 
 if (SINGLE_GENERATOR)
-  install (TARGETS Animation DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS Animation DESTINATION "${INSTALL_DIR_BIN}")
 else()
   install (TARGETS Animation
            CONFIGURATIONS Release RelWithDebInfo
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+           DESTINATION "${INSTALL_DIR_BIN}")
   install (TARGETS Animation
            CONFIGURATIONS Debug
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+           DESTINATION "${INSTALL_DIR_BIN}d")
 endif()
 
 include_directories (${CMAKE_BINARY_DIR}/inc

diff --git a/samples/mfc/standard/10_Convert/CMakeLists.txt b/samples/mfc/standard/10_Convert/CMakeLists.txt
index 9f284679157ccbefdced72854270ffd8bfb96487..9073756fc2ba6d24c7abef11f3bdd35de8adebcf 100644 (file)
--- a/samples/mfc/standard/10_Convert/CMakeLists.txt
+++ b/samples/mfc/standard/10_Convert/CMakeLists.txt
@@ -64,14 +64,14 @@ add_executable (Convert WIN32 ${Convert_SOURCE_FILES}
 set_property (TARGET Convert PROPERTY FOLDER Samples)
 
 if (SINGLE_GENERATOR)
-  install (TARGETS Convert DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS Convert DESTINATION "${INSTALL_DIR_BIN}")
 else()
   install (TARGETS Convert
            CONFIGURATIONS Release RelWithDebInfo
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+           DESTINATION "${INSTALL_DIR_BIN}")
   install (TARGETS Convert
            CONFIGURATIONS Debug
-           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+           DESTINATION "${INSTALL_DIR_BIN}d")
 endif()
 
 include_directories (${CMAKE_BINARY_DIR}/inc

diff --git a/samples/mfc/standard/mfcsample/CMakeLists.txt b/samples/mfc/standard/mfcsample/CMakeLists.txt
index 08e3c428c329a0e0baf85927ca2088cc92074302..05664ef70b4e7a44a30072bcbe9ef6da110917c7 100644 (file)
--- a/samples/mfc/standard/mfcsample/CMakeLists.txt
+++ b/samples/mfc/standard/mfcsample/CMakeLists.txt
@@ -140,20 +140,20 @@ set_property (TARGET mfcsample PROPERTY FOLDER Samples)
 
 if (SINGLE_GENERATOR)
   install (TARGETS mfcsample
-           RUNTIME DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}"
-           ARCHIVE DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
-           LIBRARY DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
+           RUNTIME DESTINATION "${INSTALL_DIR_BIN}"
+           ARCHIVE DESTINATION "${INSTALL_DIR_LIB}"
+           LIBRARY DESTINATION "${INSTALL_DIR_LIB}")
 else()
   install (TARGETS mfcsample
            CONFIGURATIONS Release RelWithDebInfo
-           RUNTIME DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}"
-           ARCHIVE DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
-           LIBRARY DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
+           RUNTIME DESTINATION "${INSTALL_DIR_BIN}"
+           ARCHIVE DESTINATION "${INSTALL_DIR_LIB}"
+           LIBRARY DESTINATION "${INSTALL_DIR_LIB}")
   install (TARGETS mfcsample
            CONFIGURATIONS Debug
-           RUNTIME DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d"
-           ARCHIVE DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d"
-           LIBRARY DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d")
+           RUNTIME DESTINATION "${INSTALL_DIR_BIN}d"
+           ARCHIVE DESTINATION "${INSTALL_DIR_LIB}d"
+           LIBRARY DESTINATION "${INSTALL_DIR_LIB}d")
 endif()
 
 include_directories( ${CMAKE_BINARY_DIR}/inc