Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 610362 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-11 / +6 lines)
Line  Link Here
0
-- CMakeLists.txt
0
++ CMakeLists.txt
Lines 77-83 Link Here
77
endif()
77
endif()
78
78
79
if (BUILD_WITH_DEBUG)
79
if (BUILD_WITH_DEBUG)
80
  message (STATUS "xmw: debug")
80
  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:DEBUG>:OCCT_DEBUG>)
81
  set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:DEBUG>:OCCT_DEBUG>)
82
else ()
83
  message (STATUS "xmw: no debug")
81
endif()
84
endif()
82
85
83
# copy samples to install directory
86
# copy samples to install directory
Lines 758-772 Link Here
758
endif()
758
endif()
759
759
760
 # change custom.bat/sh
760
 # change custom.bat/sh
761
if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
761
OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
762
  file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
763
764
  set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
765
766
  file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
767
else()
768
  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
769
endif()
770
762
771
# write current custom.bat/sh (for install directory)
763
# write current custom.bat/sh (for install directory)
772
set (SUB_CUSTOM_BUILD_NAME "custom_${COMPILER}_${COMPILER_BITNESS}.install.${SCRIPT_EXT}")
764
set (SUB_CUSTOM_BUILD_NAME "custom_${COMPILER}_${COMPILER_BITNESS}.install.${SCRIPT_EXT}")
Lines 909-915 Link Here
909
endforeach()
909
endforeach()
910
# install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
910
# install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
911
install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
911
install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
912
install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
912
install (FILES "${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake" DESTINATION "${INSTALL_DIR_CMAKE}")
913
913
914
foreach (OCCT_MODULE ${OCCT_MODULES})
914
foreach (OCCT_MODULE ${OCCT_MODULES})
915
  if (BUILD_MODULE_${OCCT_MODULE})
915
  if (BUILD_MODULE_${OCCT_MODULE})

Return to bug 610362