0002793: BinOcaf: low performance saving documents with large attributes
[occt.git] / CMakeLists.txt
index 60fbdf2..1468ea7 100644 (file)
@@ -69,10 +69,6 @@ else()
   SET(COMPILER ${CMAKE_GENERATOR})
 endif()
 
-if (${COMPILER_BITNESS} STREQUAL 64)
-  add_definitions(-D_OCC64)
-endif()
-
 add_definitions(-DCSFDB)
 if(WIN32)
   add_definitions(/DWNT -wd4996)
@@ -300,8 +296,11 @@ INCLUDE(adm/templates/tcl.cmake)
 
 #install tcltk
 IF(INSTALL_TCL)
-  GET_FILENAME_COMPONENT(3RDPARTY_TCL_LIB_DIR "${3RDPARTY_TCL_LIBRARY}" PATH)
-  GET_FILENAME_COMPONENT(3RDPARTY_TCL_DLL_DIR "${3RDPARTY_TCL_DLL}" PATH)
+  SET(3RDPARTY_TCL_DLL_DIR "")
+  SET(3RDPARTY_TCL_LIB_DIR "")
+  
+  GET_FILENAME_COMPONENT(3RDPARTY_TCL_LIB_DIR_INSIDE "${3RDPARTY_TCL_LIBRARY}" PATH)
+  GET_FILENAME_COMPONENT(3RDPARTY_TCL_DLL_DIR_INSIDE "${3RDPARTY_TCL_DLL}" PATH)
 
   IF (IS_TCL_VERSION_FOUND)
     SET (TCL_VERSION ${TCL_MAJOR_VERSION}${TCL_SEP}${TCL_MINOR_VERSION})
@@ -313,16 +312,20 @@ IF(INSTALL_TCL)
     SET (TCL_FOLDER_VERSION "")
   ENDIF()
   
-  INSTALL(FILES "${3RDPARTY_TCL_DLL_DIR}/${DLL_SO_PREFIX}tcl${TCL_VERSION}.${DLL_SO}" DESTINATION "${INSTALL_DIR}/${DLL_SO_FOLDER}")
-  INSTALL(FILES "${3RDPARTY_TCL_DLL_DIR}/${DLL_SO_PREFIX}tk${TCL_VERSION}.${DLL_SO}" DESTINATION "${INSTALL_DIR}/${DLL_SO_FOLDER}")
+  INSTALL(FILES "${3RDPARTY_TCL_DLL_DIR_INSIDE}/${DLL_SO_PREFIX}tcl${TCL_VERSION}.${DLL_SO}" DESTINATION "${INSTALL_DIR}/${DLL_SO_FOLDER}")
+  INSTALL(FILES "${3RDPARTY_TCL_DLL_DIR_INSIDE}/${DLL_SO_PREFIX}tk${TCL_VERSION}.${DLL_SO}" DESTINATION "${INSTALL_DIR}/${DLL_SO_FOLDER}")
   
   IF (IS_TCL_VERSION_FOUND)
-    INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR}/tcl${TCL_FOLDER_VERSION}" DESTINATION "${INSTALL_DIR}/lib")
-    INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR}/tk${TCL_FOLDER_VERSION}" DESTINATION "${INSTALL_DIR}/lib")
+    INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR_INSIDE}/tcl8" DESTINATION "${INSTALL_DIR}/lib")
+    INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR_INSIDE}/tcl${TCL_FOLDER_VERSION}" DESTINATION "${INSTALL_DIR}/lib")
+    INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR_INSIDE}/tk${TCL_FOLDER_VERSION}" DESTINATION "${INSTALL_DIR}/lib")
   ELSE()
     MESSAGE(STATUS "\nWarning: tclX.X and tkX.X subdirs won't be copyied during the installation process.")
     MESSAGE(STATUS "Try seeking tcl within another folder by changing 3RDPARTY_TCL_DIR variable.")
   ENDIF()
+ELSE()
+  GET_FILENAME_COMPONENT(3RDPARTY_TCL_DLL_DIR "${3RDPARTY_TCL_DLL}" PATH)
+  GET_FILENAME_COMPONENT(3RDPARTY_TCL_LIB_DIR "${3RDPARTY_TCL_LIBRARY}" PATH)
 ENDIF()
 
 # GLX
@@ -451,12 +454,6 @@ string( REGEX REPLACE ";" "\n\t" 3RDPARTY_LIBRARY_DIRS_WITH_ENDS "${3RDPARTY_LIB
 MESSAGE(STATUS "3RDPARTY_LIBRARY_DIRS: ${3RDPARTY_LIBRARY_DIRS_WITH_ENDS}")
 link_directories( ${3RDPARTY_LIBRARY_DIRS} )
 
-#
-SET(RUN_PROJECT "")
-SET(CASROOT_DEFINITION "set \"CASROOT=${CMAKE_SOURCE_DIR}\"")
-SET(BIN_DIR_POSTFIX "bin")
-SET(RESOURCE_DIR_PREFIX "%SCRIPTROOT%\\src")
-
 IF("${INSTALL_DIR}" STREQUAL "")
   MESSAGE(FATAL_ERROR "INSTALL_DIR is empty")
 ELSE()
@@ -479,13 +476,6 @@ ELSE()
   install(FILES "${OCCT_BINARY_DIR}/env.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" )
 ENDIF()
 
-IF(MSVC AND "${BUILD_CONFIGURATION}" STREQUAL "Debug")
-  SET(RUN_PROJECT "start OCCT.sln")
-  SET(BIN_DIR_POSTFIX "out\\bin\\Debug")
-  SET(RESOURCE_DIR_PREFIX "%CASROOT%\\src")
-  configure_file("${CMAKE_SOURCE_DIR}/adm/cmake/env.bat.in" OCCT.bat @ONLY)
-ENDIF()
-
 include(adm/cmake/CMakeToolKitsDeps.txt)
 
 IF (BUILD_Samples)