]> OCCT Git - occt-wok.git/commitdiff
0024160: Changes in VS Projects' warning level
authoromy <omy@opencascade.com>
Mon, 16 Sep 2013 12:30:27 +0000 (16:30 +0400)
committerbugmaster <bugmaster@opencascade.com>
Mon, 16 Sep 2013 12:31:22 +0000 (16:31 +0400)
Changed WarningLevel parameter for vc projects' templates.
Unused file template.cmake removed
Changed Warning Level of Automake building procedure to -Wall.

12 files changed:
src/WOKBuilderDef/CSF_LIN.edl
src/WOKTclLib/templates/template.cmake [deleted file]
src/WOKTclLib/templates/template.vc10
src/WOKTclLib/templates/template.vc10x
src/WOKTclLib/templates/template.vc11
src/WOKTclLib/templates/template.vc11x
src/WOKTclLib/templates/template.vc7
src/WOKTclLib/templates/template.vc7x
src/WOKTclLib/templates/template.vc8
src/WOKTclLib/templates/template.vc8x
src/WOKTclLib/templates/template.vc9
src/WOKTclLib/templates/template.vc9x

index 06e6e609d215b4c997334812456045fc73c7d473..757d9f9408b9b603d80c3aae7d85586913636d4d 100644 (file)
@@ -12,7 +12,7 @@
   -- gcc tools should be available in PATH
   -- C++ compiler
   @set %CSF_CXX_COMPILER   = "g++ ";
-  @set %CSF_CXX_SysOptions = " -fPIC -DPIC";
+  @set %CSF_CXX_SysOptions = " -fPIC -DPIC -Wall";
   @string %CSF_CXX_Options = " -DLIN -DLININTEL -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 " %CSF_PRODUCTS_DEFINES " ";
   @set %CSF_CXX_ModeOpt    = " -O3 -DNDEBUG -DNo_Exception ";
   @set %CSF_CXX_ModeOptDeb = " -g -O0 -DDEB -D_DEBUG ";
@@ -20,7 +20,7 @@
   -- C compiler
   @set %CSF_C_COMPILER = "gcc ";
   @string %CSF_C_INCLUDE +=  "";
-  @set %CSF_C_SysOptions = " -fPIC -DPIC";
+  @set %CSF_C_SysOptions = " -fPIC -DPIC -Wall";
   @set %CSF_C_Options    = " -DLIN -DLININTEL -D_GNU_SOURCE=1 -fexceptions";
   @set %CSF_C_ModeOpt    = " -O3 -DNDEBUG -DNo_Exception ";
   @set %CSF_C_ModeOptDeb = " -O0 -g -DDEB -D_DEBUG ";
diff --git a/src/WOKTclLib/templates/template.cmake b/src/WOKTclLib/templates/template.cmake
deleted file mode 100644 (file)
index a10d472..0000000
+++ /dev/null
@@ -1,529 +0,0 @@
-cmake_minimum_required ( VERSION 2.6)
-
-if (NOT BUILD_TYPE)
-  set(BUILD_TYPE "Release" CACHE STRING "Build type of the __PROJECT_NAME__" FORCE)
-  SET_PROPERTY(CACHE BUILD_TYPE PROPERTY STRINGS Release Debug)
-endif()
-
-set(CMAKE_CONFIGURATION_TYPES ${BUILD_TYPE} CACHE INTERNAL "" FORCE)
-
-project(__PROJECT_NAME__)
-
-set_property(GLOBAL PROPERTY 3RDPARTY_USE_FOLDERS ON)
-
-set(BUILD_SHARED_LIBS ON)
-
-IF("${BUILD_TYPE}" STREQUAL "${CMAKE_BUILD_TYPE}" AND "${BUILD_BITNESS}" STREQUAL "${BUILD_BITNESS1}")
-  SET(CHANGES_ARE_NEEDED OFF)
-ELSE()
-  SET(CHANGES_ARE_NEEDED ON)
-ENDIF()
-
-set(BUILD_BITNESS __BITNESS__ CACHE STRING "Bitness of the __PROJECT_NAME__ project")
-SET_PROPERTY(CACHE BUILD_BITNESS PROPERTY STRINGS 32 64)
-
-SET(BUILD_BITNESS1 ${BUILD_BITNESS} CACHE INTERNAL "Temporary bitness is created to check whether change 3rdparty paths or not" FORCE)
-
-SET( CMAKE_BUILD_TYPE ${BUILD_TYPE} CACHE INTERNAL "Build type of the __PROJECT_NAME__" FORCE )
-
-SET( INSTALL_DIR "" CACHE PATH "Directory contains install files of the __PROJECT_NAME__" )
-SET( CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE )
-
-set (BUILD_TOOLKITS "" CACHE STRING "Toolkits are included in __PROJECT_NAME__")
-separate_arguments(BUILD_TOOLKITS)
-
-__MODULE_LIST__
-
-if (WIN32)
-  set(SCRIPT_EXT bat)
-else()
-  set(SCRIPT_EXT sh)
-endif()
-
-if (DEFINED MSVC70)
-  SET(COMPILER vc7)
-elseif (DEFINED MSVC80)
-  SET(COMPILER vc8)
-elseif (DEFINED MSVC90)
-  SET(COMPILER vc9)
-elseif (DEFINED MSVC10)
-  SET(COMPILER vc10)
-elseif (DEFINED MSVC11)
-  SET(COMPILER vc11)
-else()
-  SET(COMPILER ${CMAKE_GENERATOR})
-endif()
-
-if (${BUILD_BITNESS} STREQUAL 64)
-  add_definitions(-D_OCC64)
-endif()
-
-add_definitions(-DCSFDB)
-if(WIN32)
-  add_definitions(/DWNT -wd4996)
-elseif(APPLE)
-  add_definitions(-fexceptions -fPIC -DOCC_CONVERT_SIGNALS -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H)
-else()
-  add_definitions(-fexceptions -fPIC -DOCC_CONVERT_SIGNALS -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H -DLIN)
-endif()
-
-string(REGEX MATCH "EHsc" ISFLAG "${CMAKE_CXX_FLAGS}")
-IF(ISFLAG)
-  STRING(REGEX REPLACE "EHsc" "EHa" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-ELSEIF(WIN32)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -EHa")
-ENDIF()
-
-IF(WIN32)
-  IF(NOT DEFINED MSVC70 AND NOT DEFINED MSVC80)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -MP")
-  ENDIF()
-ENDIF()
-
-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
-SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
-
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEB")
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEB")
-
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/bin)
-
-# RESOURCES
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/DrawResources" DESTINATION  "${INSTALL_DIR}/src" )
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/StdResource" DESTINATION  "${INSTALL_DIR}/src" )
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/SHMessage" DESTINATION  "${INSTALL_DIR}/src" )
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/Textures" DESTINATION  "${INSTALL_DIR}/src" )
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/XSMessage" DESTINATION  "${INSTALL_DIR}/src" )
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/TObj" DESTINATION  "${INSTALL_DIR}/src" )
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/XSTEPResource" DESTINATION  "${INSTALL_DIR}/src" )
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/src/XmlOcafResource" DESTINATION  "${INSTALL_DIR}/src" )
-
-install(FILES "${CMAKE_SOURCE_DIR}/src/UnitsAPI/Lexi_Expr.dat" DESTINATION  "${INSTALL_DIR}/src/UnitsAPI" )
-install(FILES "${CMAKE_SOURCE_DIR}/src/UnitsAPI/Units.dat"     DESTINATION  "${INSTALL_DIR}/src/UnitsAPI" )
-
-IF("${BUILD_TYPE}" STREQUAL "Release") 
-  SET(BUILD_SUFFIX "")
-ELSE()
-  SET(BUILD_SUFFIX "") # debug == release
-ENDIF()
-
-FUNCTION(SUBDIRECTORY_NAMES MAIN_DIRECTORY RESULT)
-  file(GLOB SUB_ITEMS "${MAIN_DIRECTORY}/*")
-  
-  foreach(ITEM ${SUB_ITEMS})
-    if(IS_DIRECTORY "${ITEM}")
-      GET_FILENAME_COMPONENT(ITEM_NAME "${ITEM}" NAME)
-      LIST(APPEND LOCAL_RESULT "${ITEM_NAME}")
-    endif()
-  endforeach()
-  set (${RESULT} ${LOCAL_RESULT} PARENT_SCOPE)
-ENDFUNCTION()
-
-FUNCTION(FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
-  string( TOLOWER "${PRODUCT_NAME}" lower_PRODUCT_NAME )
-  
-  LIST(APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}.*${COMPILER}.*${BUILD_BITNESS}")
-  LIST(APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}.*[0-9.]+.*${COMPILER}.*${BUILD_BITNESS}")
-  LIST(APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}.*[0-9.]+.*${BUILD_BITNESS}")
-  LIST(APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}.*[0-9.]+")
-  LIST(APPEND SEARCH_TEMPLATES "${lower_PRODUCT_NAME}")
-  
-  SUBDIRECTORY_NAMES( "${ROOT_DIR}" SUBDIR_NAME_LIST)
-  
-  FOREACH( SEARCH_TEMPLATE ${SEARCH_TEMPLATES})
-    IF(LOCAL_RESULT)
-      BREAK()
-    ENDIF()
-    
-    FOREACH(SUBDIR_NAME ${SUBDIR_NAME_LIST})
-      string( TOLOWER "${SUBDIR_NAME}" lower_SUBDIR_NAME )
-      
-      STRING(REGEX MATCH "${SEARCH_TEMPLATE}" DUMMY_VAR "${lower_SUBDIR_NAME}")
-      IF(DUMMY_VAR)
-        LIST(APPEND LOCAL_RESULT ${SUBDIR_NAME})
-      ENDIF()
-    ENDFOREACH()
-  ENDFOREACH()
-  
-  IF(LOCAL_RESULT)
-    LIST(LENGTH "${LOCAL_RESULT}" LOC_LEN)
-    MATH(EXPR LAST_ELEMENT_INDEX "${LOC_LEN}-1")
-    LIST(GET LOCAL_RESULT ${LAST_ELEMENT_INDEX} DUMMY)
-    SET(${RESULT} ${DUMMY} PARENT_SCOPE)
-  ENDIF()  
-ENDFUNCTION()
-
-IF(WIN32)
-  SET(DLL_SO "dll")
-  SET(DLL_SO_FOLDER "bin")
-  SET(DLL_SO_PREFIX "")
-ELSEIF(APPLE)
-  SET(DLL_SO "dylib")
-  SET(DLL_SO_FOLDER "lib")
-  SET(DLL_SO_PREFIX "lib")
-ELSE()
-  SET(DLL_SO "so")
-  SET(DLL_SO_FOLDER "lib")
-  SET(DLL_SO_PREFIX "lib")
-ENDIF()
-
-SET(3RDPARTY_DIR "" CACHE PATH "Directory contains required 3rdparty products")
-SET(3RDPARTY_INCLUDE_DIRS "")
-SET(3RDPARTY_NOT_INCLUDED)
-
-IF(APPLE)
-  SET(3RDPARTY_USE_GLX OFF CACHE BOOL "whether use X11 OpenGL on OSX or not")
-ENDIF()
-
-SET(3RDPARTY_USE_GL2PS OFF CACHE BOOL "whether use gl2ps product or not")
-SET(3RDPARTY_USE_FREEIMAGE OFF CACHE BOOL "whether use freeimage product or not")
-SET(3RDPARTY_USE_TBB OFF CACHE BOOL "whether use tbb product or not")
-
-SET(INSTALL_TESTS OFF CACHE BOOL "Is tests copy to install directory")
-
-MACRO(THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME)
-  IF(NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DIR)
-    SET(3RDPARTY_${PRODUCT_NAME}_DIR "" CACHE PATH "Directory contains ${PRODUCT_NAME} product")
-  ENDIF()
-  
-  IF(3RDPARTY_DIR AND ("${3RDPARTY_${PRODUCT_NAME}_DIR}" STREQUAL "" OR CHANGES_ARE_NEEDED))
-    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" ${PRODUCT_NAME} ${PRODUCT_NAME}_DIR_NAME)
-    IF("${${PRODUCT_NAME}_DIR_NAME}" STREQUAL "")
-      MESSAGE(STATUS "${PRODUCT_NAME} DON'T FIND")
-    ELSE()
-      SET(3RDPARTY_${PRODUCT_NAME}_DIR "${3RDPARTY_DIR}/${${PRODUCT_NAME}_DIR_NAME}" CACHE PATH "Directory contains ${PRODUCT_NAME} product" FORCE)
-    ENDIF()
-  ENDIF()
-  
-  SET(INSTALL_${PRODUCT_NAME} OFF CACHE BOOL "Is ${PRODUCT_NAME} lib copy to install directory")
-
-  IF(3RDPARTY_${PRODUCT_NAME}_DIR)
-    IF("${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND")
-      SET(3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "Directory contains headers of the ${PRODUCT_NAME} product" FORCE)
-      FIND_PATH(3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR ${HEADER_NAME} PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}/include" NO_DEFAULT_PATH)
-      
-      IF("${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND")
-        FIND_PATH(3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR ${HEADER_NAME})
-      ENDIF()
-      
-    ENDIF()
-    
-    IF("${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_LIBRARY-NOTFOUND")
-      SET(3RDPARTY_${PRODUCT_NAME}_LIBRARY "3RDPARTY_${PRODUCT_NAME}_LIBRARY-NOTFOUND" CACHE FILEPATH "Directory contains library of the ${PRODUCT_NAME} product" FORCE)
-      FIND_LIBRARY(3RDPARTY_${PRODUCT_NAME}_LIBRARY ${LIBRARY_NAME}  PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}/lib" NO_DEFAULT_PATH)
-      
-      # check default path for library search
-      IF("${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_LIBRARY-NOTFOUND")
-        FIND_LIBRARY(3RDPARTY_${PRODUCT_NAME}_LIBRARY ${LIBRARY_NAME})
-      ENDIF()
-    ENDIF()
-    
-    IF("${3RDPARTY_${PRODUCT_NAME}_DLL}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_${PRODUCT_NAME}_DLL}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL-NOTFOUND")
-      SET(3RDPARTY_${PRODUCT_NAME}_DLL "3RDPARTY_${PRODUCT_NAME}_DLL-NOTFOUND" CACHE FILEPATH "Directory contains shared library of the ${PRODUCT_NAME} product" FORCE)
-      FIND_FILE(3RDPARTY_${PRODUCT_NAME}_DLL "${DLL_SO_PREFIX}${LIBRARY_NAME}.${DLL_SO}"  PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}/${DLL_SO_FOLDER}" NO_DEFAULT_PATH)
-      
-      IF("${3RDPARTY_${PRODUCT_NAME}_DLL}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL-NOTFOUND")
-        FIND_FILE(3RDPARTY_${PRODUCT_NAME}_DLL "${DLL_SO_PREFIX}${LIBRARY_NAME}.${DLL_SO}")
-      ENDIF()
-    ENDIF()
-    MARK_AS_ADVANCED(3RDPARTY_${PRODUCT_NAME}_DIR)
-  ENDIF()
-
-  IF(3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
-    SET(3RDPARTY_INCLUDE_DIRS "${3RDPARTY_INCLUDE_DIRS};${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
-  ENDIF()
-
-  IF(3RDPARTY_${PRODUCT_NAME}_LIBRARY)
-    GET_FILENAME_COMPONENT(3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" PATH)
-    SET(3RDPARTY_LIBRARY_DIRS "${3RDPARTY_LIBRARY_DIRS};${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR}")
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_LIBRARY)
-  ENDIF()
-  
-  IF(3RDPARTY_${PRODUCT_NAME}_DLL)
-    #
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_DLL)
-  ENDIF()
-
-  IF(INSTALL_${PRODUCT_NAME})
-    INSTALL(FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" DESTINATION "${INSTALL_DIR}/${DLL_SO_FOLDER}")
-    SET(3RDPARTY_${PRODUCT_NAME}_DLL_DIR "")
-  ELSE()
-    GET_FILENAME_COMPONENT(3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL}" PATH)
-  ENDIF()
-ENDMACRO()
-
-# TCL
-
-#tcl85 - win; tcl8.5 - lin
-IF(WIN32)
-  SET(TCL_SEP "")
-ELSE()
-  SET(TCL_SEP ".")
-ENDIF()
-  
-THIRDPARTY_PRODUCT("TCL" "tcl.h" "tcl8${TCL_SEP}5")
-
-#install tk and libs
-IF(INSTALL_TCL)
-  GET_FILENAME_COMPONENT(3RDPARTY_TK_LIB_DIR "${3RDPARTY_TCL_LIBRARY}" PATH)
-  GET_FILENAME_COMPONENT(3RDPARTY_TK_DLL_DIR "${3RDPARTY_TCL_DLL}" PATH)
-  
-  INSTALL(FILES "${3RDPARTY_TK_DLL_DIR}/${DLL_SO_PREFIX}tk8${TCL_SEP}5.${DLL_SO}" DESTINATION "${INSTALL_DIR}/${DLL_SO_FOLDER}")
-  INSTALL(DIRECTORY "${3RDPARTY_TK_LIB_DIR}/tcl8.5" DESTINATION "${INSTALL_DIR}/lib")
-  INSTALL(DIRECTORY "${3RDPARTY_TK_LIB_DIR}/tk8.5" DESTINATION "${INSTALL_DIR}/lib")
-ENDIF()
-
-# GLX
-IF(3RDPARTY_USE_GLX)
-  ADD_DEFINITIONS(-DMACOSX_USE_GLX)
-  
-  IF(NOT DEFINED 3RDPARTY_GLX_DIR)
-    SET(3RDPARTY_GLX_DIR "" CACHE PATH "Directory contains GLX product")
-  ENDIF()
-  
-  IF(3RDPARTY_DIR AND ("${3RDPARTY_GLX_DIR}" STREQUAL "" OR CHANGES_ARE_NEEDED))
-    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" GLX GLX_DIR_NAME)
-    IF("${GLX_DIR_NAME}" STREQUAL "")
-      MESSAGE(STATUS "GLX DON'T FIND")
-    ELSE()
-      SET(3RDPARTY_GLX_DIR "${3RDPARTY_DIR}/${GLX_DIR_NAME}" CACHE PATH "Directory contains GLX product" FORCE)
-    ENDIF()
-  ENDIF()
-  
-  IF(3RDPARTY_GLX_DIR)
-    SET(3RDPARTY_GLX_INCLUDE_DIR "${3RDPARTY_GLX_DIR}/include" CACHE FILEPATH "Directory contains headers of the GLX product" FORCE)
-    SET(3RDPARTY_GLX_LIBRARY_DIR "${3RDPARTY_GLX_DIR}/lib"     CACHE FILEPATH "Directory contains library of the GLX product" FORCE)
-    
-    SET(3RDPARTY_INCLUDE_DIRS "${3RDPARTY_INCLUDE_DIRS};${3RDPARTY_GLX_INCLUDE_DIR}")
-    SET(3RDPARTY_LIBRARY_DIRS "${3RDPARTY_LIBRARY_DIRS};${3RDPARTY_GLX_LIBRARY_DIR}")
-    
-    MARK_AS_ADVANCED(3RDPARTY_GLX_DIR)
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_GLX_INCLUDE_DIR)
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_GLX_LIBRARY_DIR)
-  ENDIF()
-ENDIF()
-
-# FREETYPE
-THIRDPARTY_PRODUCT("FREETYPE" "ft2build.h" "freetype${BUILD_SUFFIX}")
-
-IF("${3RDPARTY_FREETYPE_INCLUDE_DIR}" STREQUAL "" OR "${3RDPARTY_FREETYPE_INCLUDE_DIR}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND")
-  
-ELSEIF(EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR}/freetype2/")
-  SET(3RDPARTY_INCLUDE_DIRS "${3RDPARTY_INCLUDE_DIRS};${3RDPARTY_FREETYPE_INCLUDE_DIR}/freetype2")
-ENDIF()
-
-# FREEIMAGE
-IF(3RDPARTY_USE_FREEIMAGE)
-  ADD_DEFINITIONS(-DHAVE_FREEIMAGE) 
-
-  THIRDPARTY_PRODUCT("FREEIMAGE" "FreeImage.h" "freeimage${BUILD_SUFFIX}")
-  IF(WIN32)
-    IF("${3RDPARTY_FREEIMAGE_DIR}" STREQUAL "")
-    ELSE()
-      SET (3RDPARTY_FREEIMAGEPLUS_DIR "${3RDPARTY_FREEIMAGE_DIR}")
-    ENDIF()
-    
-    THIRDPARTY_PRODUCT("FREEIMAGEPLUS" "FreeImagePlus.h" "freeimageplus${BUILD_SUFFIX}")
-    
-  ENDIF()
-ENDIF()
-
-# GL2PS
-IF(3RDPARTY_USE_GL2PS)
-  ADD_DEFINITIONS(-DHAVE_GL2PS)
-  THIRDPARTY_PRODUCT("GL2PS" "gl2ps.h" "gl2ps${BUILD_SUFFIX}")
-ENDIF()
-
-# TBB
-IF (3RDPARTY_USE_TBB)
-  ADD_DEFINITIONS(-DHAVE_TBB)
-
-  IF(${BUILD_BITNESS} STREQUAL 32)
-    SET (TBB_ARCH_NAME ia32)
-  ELSE()
-    SET (TBB_ARCH_NAME intel64)
-  ENDIF()
-  
-  IF(NOT DEFINED 3RDPARTY_TBB_DIR)
-    SET(3RDPARTY_TBB_DIR "" CACHE PATH "Directory contains tbb product")
-  ENDIF()
-  
-  SET(3RDPARTY_TBB_DIR_NAME "")
-  IF(3RDPARTY_DIR AND ("${3RDPARTY_TBB_DIR}" STREQUAL "" OR CHANGES_ARE_NEEDED))
-    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" "TBB" 3RDPARTY_TBB_DIR_NAME)
-    IF("${3RDPARTY_TBB_DIR_NAME}" STREQUAL "")
-      MESSAGE(STATUS "TBB DON'T FIND")
-    ELSE()
-      SET(3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${3RDPARTY_TBB_DIR_NAME}" CACHE PATH "Directory contains tbb product" FORCE)
-    ENDIF()
-  ENDIF()
-  
-  SET(INSTALL_TBB OFF CACHE BOOL "Is tbb lib copy to install directory")
-
-  IF(3RDPARTY_TBB_DIR)
-    IF("${3RDPARTY_TBB_INCLUDE_DIR}" STREQUAL "" OR CHANGES_ARE_NEEDED)
-      SET(3RDPARTY_TBB_INCLUDE_DIR "3RDPARTY_TBB_INCLUDE_DIR-NOTFOUND" CACHE PATH "Directory contains headers of the tbb product" FORCE)
-      FIND_PATH(3RDPARTY_TBB_INCLUDE_DIR tbb/tbb.h PATHS "${3RDPARTY_TBB_DIR}/include")
-    ENDIF()
-
-    SET(TBB_DEBUG_POSTFIX "")
-    if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-      SET(TBB_DEBUG_POSTFIX "") # _debug postfix removed
-    ENDIF()
-    
-    IF("${3RDPARTY_TBB_LIBRARY}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_TBB_LIBRARY}" STREQUAL "3RDPARTY_TBB_LIBRARY-NOTFOUND")
-      SET(3RDPARTY_TBB_LIBRARY "3RDPARTY_TBB_LIBRARY-NOTFOUND" CACHE PATH "Directory contains library of the tbb product" FORCE)
-      FIND_LIBRARY(3RDPARTY_TBB_LIBRARY tbb${TBB_DEBUG_POSTFIX} PATHS "${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/${COMPILER}" NO_DEFAULT_PATH)
-      
-      IF("${3RDPARTY_TBB_LIBRARY}" STREQUAL "3RDPARTY_TBB_LIBRARY-NOTFOUND")
-        FIND_LIBRARY(3RDPARTY_TBB_LIBRARY tbb${TBB_DEBUG_POSTFIX})
-      ENDIF()
-    ENDIF()
-
-    IF("${3RDPARTY_TBB_MALLOC_LIBRARY}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_TBB_MALLOC_LIBRARY}" STREQUAL "3RDPARTY_TBB_MALLOC_LIBRARY-NOTFOUND")
-      SET(3RDPARTY_TBB_MALLOC_LIBRARY "3RDPARTY_TBB_MALLOC_LIBRARY-NOTFOUND" CACHE PATH "Directory contains library of the tbb malloc product" FORCE)
-      FIND_LIBRARY(3RDPARTY_TBB_MALLOC_LIBRARY tbbmalloc${TBB_DEBUG_POSTFIX} PATHS "${3RDPARTY_TBB_DIR}/lib/${TBB_ARCH_NAME}/${COMPILER}" NO_DEFAULT_PATH)
-      
-      IF("${3RDPARTY_TBB_MALLOC_LIBRARY}" STREQUAL "3RDPARTY_TBB_MALLOC_LIBRARY-NOTFOUND")
-        FIND_LIBRARY(3RDPARTY_TBB_MALLOC_LIBRARY tbbmalloc${TBB_DEBUG_POSTFIX})
-      ENDIF()
-    ENDIF()
-    
-    
-    
-    IF("${3RDPARTY_TBB_DLL}" STREQUAL "" OR CHANGES_ARE_NEEDED)
-      SET(3RDPARTY_TBB_DLL "3RDPARTY_TBB_DLL-NOTFOUND" CACHE PATH "Directory contains shared library of the tbb product" FORCE)
-      FIND_FILE(3RDPARTY_TBB_DLL "${DLL_SO_PREFIX}tbb${TBB_DEBUG_POSTFIX}.${DLL_SO}" PATHS "${3RDPARTY_TBB_DIR}/${DLL_SO_FOLDER}/${TBB_ARCH_NAME}/${COMPILER}" NO_DEFAULT_PATH)
-      
-      IF("${3RDPARTY_TBB_DLL}" STREQUAL "3RDPARTY_TBB_DLL-NOTFOUND")
-        FIND_FILE(3RDPARTY_TBB_DLL "${DLL_SO_PREFIX}tbb${TBB_DEBUG_POSTFIX}.${DLL_SO}")
-      ENDIF()
-    ENDIF()
-    
-    IF("${3RDPARTY_TBB_MALLOC_DLL}" STREQUAL "" OR CHANGES_ARE_NEEDED)
-      SET(3RDPARTY_TBB_MALLOC_DLL "3RDPARTY_TBB_MALLOC_DLL-NOTFOUND" CACHE PATH "Directory contains shared library of the tbb malloc product" FORCE)
-      FIND_FILE(3RDPARTY_TBB_MALLOC_DLL "${DLL_SO_PREFIX}tbbmalloc${TBB_DEBUG_POSTFIX}.${DLL_SO}" PATHS "${3RDPARTY_TBB_DIR}/${DLL_SO_FOLDER}/${TBB_ARCH_NAME}/${COMPILER}" NO_DEFAULT_PATH)
-      
-      IF("${3RDPARTY_TBB_MALLOC_DLL}" STREQUAL "3RDPARTY_TBB_MALLOC_DLL-NOTFOUND")
-        FIND_FILE(3RDPARTY_TBB_MALLOC_DLL "${DLL_SO_PREFIX}tbbmalloc${TBB_DEBUG_POSTFIX}.${DLL_SO}")
-      ENDIF()
-    ENDIF()
-
-    MARK_AS_ADVANCED(3RDPARTY_TBB_DIR_NAME)
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_DIR)
-  ENDIF()
-
-  IF(3RDPARTY_TBB_INCLUDE_DIR)
-    SET(3RDPARTY_INCLUDE_DIRS "${3RDPARTY_INCLUDE_DIRS};${3RDPARTY_TBB_INCLUDE_DIR}")
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
-  ENDIF()
-
-  IF(3RDPARTY_TBB_LIBRARY)
-    GET_FILENAME_COMPONENT(3RDPARTY_TBB_LIBRARY_DIR "${3RDPARTY_TBB_LIBRARY}" PATH)
-    SET(3RDPARTY_LIBRARY_DIRS "${3RDPARTY_LIBRARY_DIRS};${3RDPARTY_TBB_LIBRARY_DIR}")
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_LIBRARY)
-  ENDIF()
-  
-  IF(3RDPARTY_TBB_MALLOC_LIBRARY)
-    GET_FILENAME_COMPONENT(3RDPARTY_TBB_LIBRARY_DIR "${3RDPARTY_TBB_MALLOC_LIBRARY}" PATH)
-    SET(3RDPARTY_LIBRARY_DIRS "${3RDPARTY_LIBRARY_DIRS};${3RDPARTY_TBB_LIBRARY_DIR}")
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_MALLOC_LIBRARY)
-  ENDIF()
-  
-  IF(3RDPARTY_TBB_DLL)
-    #
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_DLL)
-  ENDIF()
-  
-  IF(3RDPARTY_TBB_MALLOC_DLL)
-    #
-  ELSE()
-    LIST(APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_MALLOC_DLL)
-  ENDIF()
-
-  IF(INSTALL_TBB)
-    INSTALL(FILES "${3RDPARTY_TBB_DLL}" "${3RDPARTY_TBB_MALLOC_DLL}" DESTINATION "${INSTALL_DIR}/${DLL_SO_FOLDER}")
-
-    SET(3RDPARTY_TBB_DLL_DIR "")
-    SET(3RDPARTY_TBB_MALLOC_DLL_DIR "")
-  ELSE()
-    GET_FILENAME_COMPONENT(3RDPARTY_TBB_DLL_DIR "${3RDPARTY_TBB_DLL}" PATH)
-    GET_FILENAME_COMPONENT(3RDPARTY_TBB_MALLOC_DLL_DIR "${3RDPARTY_TBB_MALLOC_DLL}" PATH)
-  ENDIF()
-ENDIF()
-
-string( REGEX REPLACE ";" " " 3RDPARTY_NOT_INCLUDED "${3RDPARTY_NOT_INCLUDED}")
-
-#CHECK ALL 3RDPARTY PATHS
-IF(3RDPARTY_NOT_INCLUDED)
-  MESSAGE(FATAL_ERROR "NOT FOUND: ${3RDPARTY_NOT_INCLUDED}" )
-ENDIF()
-
-list(REMOVE_DUPLICATES 3RDPARTY_INCLUDE_DIRS)
-string( REGEX REPLACE ";" "\n\t" 3RDPARTY_INCLUDE_DIRS_WITH_ENDS "${3RDPARTY_INCLUDE_DIRS}")
-MESSAGE(STATUS "3RDPARTY_INCLUDE_DIRS: ${3RDPARTY_INCLUDE_DIRS_WITH_ENDS}")
-include_directories( ${3RDPARTY_INCLUDE_DIRS} )
-
-list(REMOVE_DUPLICATES 3RDPARTY_LIBRARY_DIRS)
-string( REGEX REPLACE ";" "\n\t" 3RDPARTY_LIBRARY_DIRS_WITH_ENDS "${3RDPARTY_LIBRARY_DIRS}")
-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()
-  # inc,data,tests DIRECTORY
-  install(DIRECTORY "${CMAKE_SOURCE_DIR}/inc"   DESTINATION  "${INSTALL_DIR}" )
-  IF(INSTALL_TESTS)
-    install(DIRECTORY "${CMAKE_SOURCE_DIR}/data"  DESTINATION  "${INSTALL_DIR}" )
-    install(DIRECTORY "${CMAKE_SOURCE_DIR}/tests" DESTINATION  "${INSTALL_DIR}" )
-  ENDIF()
-
-  # DRAW.BAT or DRAW.SH
-  install(FILES "${CMAKE_SOURCE_DIR}/adm/cmake/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS  OWNER_READ OWNER_WRITE OWNER_EXECUTE 
-                                                                              GROUP_READ GROUP_WRITE GROUP_EXECUTE 
-                                                                              WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-
-  configure_file("${CMAKE_SOURCE_DIR}/adm/cmake/env.${SCRIPT_EXT}.in" env.${SCRIPT_EXT} @ONLY)
-  install(FILES "${__PROJECT_NAME___BINARY_DIR}/env.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" )
-ENDIF()
-
-IF(MSVC AND "${BUILD_TYPE}" STREQUAL "Debug")
-  SET(RUN_PROJECT "start __PROJECT_NAME__.sln")
-  SET(BIN_DIR_POSTFIX "out\\bin\\Debug")
-  SET(RESOURCE_DIR_PREFIX "%CASROOT%\\src")
-  configure_file("${CMAKE_SOURCE_DIR}/adm/cmake/env.bat.in" __PROJECT_NAME__.bat @ONLY)
-ENDIF()
-  
-__TOOLKIT_DEPS__
-
-__MODULE_DEPS__
-
-list( APPEND USED_TOOLKITS ${BUILD_TOOLKITS})
-
-foreach( TOOLKIT ${USED_TOOLKITS} )
- set(TurnONthe${TOOLKIT} ON)
- foreach( TK ${${TOOLKIT}_DEPS})
-   set(TurnONthe${TK} ON)
- endforeach()
-endforeach()
-
-__INCLUDE_TOOLKITS__
\ No newline at end of file
index 0692b74245db4ddadbffd12ac57da65dff913147..a52d31a79602862d9112d6742a3b1fae6bd0009f 100644 (file)
@@ -89,7 +89,7 @@
       <AssemblerListingLocation>.\..\..\..\win32\vc10\obj\__TKNAM__/</AssemblerListingLocation>
       <ObjectFileName>.\..\..\..\win32\vc10\obj\__TKNAM__/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\..\..\win32\vc10\obj\__TKNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
       <AssemblerListingLocation>.\..\..\..\win32\vc10\objd\__TKNAM__/</AssemblerListingLocation>
       <ObjectFileName>.\..\..\..\win32\vc10\objd\__TKNAM__/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\..\..\win32\vc10\objd\__TKNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <AssemblerListingLocation>.\..\..\..\win64\vc10\obj\__TKNAM__/</AssemblerListingLocation>
       <ObjectFileName>.\..\..\..\win64\vc10\obj\__TKNAM__/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\..\..\win64\vc10\obj\__TKNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
       <AssemblerListingLocation>.\..\..\..\win64\vc10\objd\__TKNAM__/</AssemblerListingLocation>
       <ObjectFileName>.\..\..\..\win64\vc10\objd\__TKNAM__/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\..\..\win64\vc10\objd\__TKNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
index 2e6dc977d47d72d70777f1d679b08013e0b78340..8347dde63835214ca612dd635fcb7906695f3a9a 100644 (file)
@@ -89,7 +89,7 @@
       <AssemblerListingLocation>.\..\..\..\win32\vc10\obj\__XQTNAM__/</AssemblerListingLocation>
       <ObjectFileName>.\..\..\..\win32\vc10\obj\__XQTNAM__/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\..\..\win32\vc10\obj\__XQTNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
       <AssemblerListingLocation>.\..\..\..\win32\vc10\objd\__XQTNAM__/</AssemblerListingLocation>
       <ObjectFileName>.\..\..\..\win32\vc10\objd\__XQTNAM__/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\..\..\win32\vc10\objd\__XQTNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <AssemblerListingLocation>.\..\..\..\win64\vc10\obj\__XQTNAM__/</AssemblerListingLocation>
       <ObjectFileName>.\..\..\..\win64\vc10\obj\__XQTNAM__/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\..\..\win64\vc10\obj\__XQTNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
       <AssemblerListingLocation>.\..\..\..\win64\vc10\objd\__XQTNAM__/</AssemblerListingLocation>
       <ObjectFileName>.\..\..\..\win64\vc10\objd\__XQTNAM__/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\..\..\win64\vc10\objd\__XQTNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
index 81d936e1abd6243659d8ff06e07c373299c029cd..dd620f2e7fa103d919ebb964aec1d23861a2f0f6 100644 (file)
@@ -93,7 +93,7 @@
       <AssemblerListingLocation>.\..\..\..\win32\vc11\obj\__TKNAM__/</AssemblerListingLocation>
       <ObjectFileName>.\..\..\..\win32\vc11\obj\__TKNAM__/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\..\..\win32\vc11\obj\__TKNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
       <AssemblerListingLocation>.\..\..\..\win32\vc11\objd\__TKNAM__/</AssemblerListingLocation>
       <ObjectFileName>.\..\..\..\win32\vc11\objd\__TKNAM__/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\..\..\win32\vc11\objd\__TKNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <AssemblerListingLocation>.\..\..\..\win64\vc11\obj\__TKNAM__/</AssemblerListingLocation>
       <ObjectFileName>.\..\..\..\win64\vc11\obj\__TKNAM__/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\..\..\win64\vc11\obj\__TKNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
       <AssemblerListingLocation>.\..\..\..\win64\vc11\objd\__TKNAM__/</AssemblerListingLocation>
       <ObjectFileName>.\..\..\..\win64\vc11\objd\__TKNAM__/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\..\..\win64\vc11\objd\__TKNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
index f89024722e43028ef9d2976f9273fba24927572a..8ec22d2ce7cb63063e8c3108d4fa477dde2d7cd3 100644 (file)
@@ -93,7 +93,7 @@
       <AssemblerListingLocation>.\..\..\..\win32\vc11\obj\__XQTNAM__/</AssemblerListingLocation>
       <ObjectFileName>.\..\..\..\win32\vc11\obj\__XQTNAM__/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\..\..\win32\vc11\obj\__XQTNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
       <AssemblerListingLocation>.\..\..\..\win32\vc11\objd\__XQTNAM__/</AssemblerListingLocation>
       <ObjectFileName>.\..\..\..\win32\vc11\objd\__XQTNAM__/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\..\..\win32\vc11\objd\__XQTNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <AssemblerListingLocation>.\..\..\..\win64\vc11\obj\__XQTNAM__/</AssemblerListingLocation>
       <ObjectFileName>.\..\..\..\win64\vc11\obj\__XQTNAM__/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\..\..\win64\vc11\obj\__XQTNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
       <AssemblerListingLocation>.\..\..\..\win64\vc11\objd\__XQTNAM__/</AssemblerListingLocation>
       <ObjectFileName>.\..\..\..\win64\vc11\objd\__XQTNAM__/</ObjectFileName>
       <ProgramDataBaseFileName>.\..\..\..\win64\vc11\objd\__XQTNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
index 6d27ab0b32f6be2bdd4ab8251d46840a6323e271..0ffd6e3631221333d7fabcc58c0f57ebcd093cdb 100644 (file)
@@ -30,7 +30,7 @@
                                AssemblerListingLocation=".\..\..\..\win32\vc7\obj\__TKNAM__/"
                                ObjectFile=".\..\..\..\win32\vc7\obj\__TKNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win32\vc7\obj\__TKNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="TRUE"/>
                        <Tool
                                Name="VCCustomBuildTool"/>
@@ -96,7 +96,7 @@
                                AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__TKNAM__/"
                                ObjectFile=".\..\..\..\win32\vc7\objd\__TKNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win32\vc7\objd\__TKNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="TRUE"
                                Detect64BitPortabilityProblems="FALSE"
                                DebugInformationFormat="3"
index 5df31d72ba2778b9bd7dbc843fec45f5aeae8072..821035a15e28f2cf7f89c0879c8d77dc542f76ef 100644 (file)
@@ -28,7 +28,7 @@
                                AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
                                ObjectFile=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="TRUE"
                                DebugInformationFormat="3"/>
                        <Tool
@@ -93,7 +93,7 @@
                                AssemblerListingLocation=".\..\..\..\win32\vc7\obj\__XQTNAM__/"
                                ObjectFile=".\..\..\..\win32\vc7\obj\__XQTNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win32\vc7\obj\__XQTNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="TRUE"/>
                        <Tool
                                Name="VCCustomBuildTool"/>
index c1af5dd32d70c43c261aab782b1a50e055318027..bffb33fd591ca2311dbe84ed4c4ff87d7ba11292 100644 (file)
@@ -59,7 +59,7 @@
                                AssemblerListingLocation=".\..\..\..\win32\vc8\obj\__TKNAM__/"
                                ObjectFile=".\..\..\..\win32\vc8\obj\__TKNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win32\vc8\obj\__TKNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DisableSpecificWarnings="4996"
                        />
                                AssemblerListingLocation=".\..\..\..\win32\vc8\objd\__TKNAM__/"
                                ObjectFile=".\..\..\..\win32\vc8\objd\__TKNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win32\vc8\objd\__TKNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
                                AssemblerListingLocation=".\..\..\..\win64\vc8\obj\__TKNAM__/"
                                ObjectFile=".\..\..\..\win64\vc8\obj\__TKNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win64\vc8\obj\__TKNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DisableSpecificWarnings="4996"
                        />
                                AssemblerListingLocation=".\..\..\..\win64\vc8\objd\__TKNAM__/"
                                ObjectFile=".\..\..\..\win64\vc8\objd\__TKNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win64\vc8\objd\__TKNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
index 32f0807261010a87a6edad4ae9e9771b21bed26c..5fa16e8903b7c7199abb4f618f1280d258a95de6 100644 (file)
@@ -56,7 +56,7 @@
                                AssemblerListingLocation=".\..\..\..\win32\vc8\objd\__XQTNAM__/"
                                ObjectFile=".\..\..\..\win32\vc8\objd\__XQTNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win32\vc8\objd\__XQTNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                                DisableSpecificWarnings="4996"
                                AssemblerListingLocation=".\..\..\..\win32\vc8\obj\__XQTNAM__/"
                                ObjectFile=".\..\..\..\win32\vc8\obj\__XQTNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win32\vc8\obj\__XQTNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DisableSpecificWarnings="4996"
                        />
                                AssemblerListingLocation=".\..\..\..\win64\vc8\objd\__XQTNAM__/"
                                ObjectFile=".\..\..\..\win64\vc8\objd\__XQTNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win64\vc8\objd\__XQTNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                                DisableSpecificWarnings="4996"
                                AssemblerListingLocation=".\..\..\..\win64\vc8\obj\__XQTNAM__/"
                                ObjectFile=".\..\..\..\win64\vc8\obj\__XQTNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win64\vc8\obj\__XQTNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DisableSpecificWarnings="4996"
                        />
index 8a03e9de97d683cb2b0a9519ebb51e8e3557f854..c628aa44b356aaafe3e5e85f460f54da1f2fc241 100644 (file)
@@ -61,7 +61,7 @@
                                AssemblerListingLocation=".\..\..\..\win32\vc9\obj\__TKNAM__/"
                                ObjectFile=".\..\..\..\win32\vc9\obj\__TKNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win32\vc9\obj\__TKNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DisableSpecificWarnings="4996"
                        />
                                AssemblerListingLocation=".\..\..\..\win32\vc9\objd\__TKNAM__/"
                                ObjectFile=".\..\..\..\win32\vc9\objd\__TKNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win32\vc9\objd\__TKNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
                                AssemblerListingLocation=".\..\..\..\win64\vc9\obj\__TKNAM__/"
                                ObjectFile=".\..\..\..\win64\vc9\obj\__TKNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win64\vc9\obj\__TKNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DisableSpecificWarnings="4996"
                        />
                                AssemblerListingLocation=".\..\..\..\win64\vc9\objd\__TKNAM__/"
                                ObjectFile=".\..\..\..\win64\vc9\objd\__TKNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win64\vc9\objd\__TKNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
index d8796ba5ddf0028e17c9a765651f6860fea97aeb..de15892c137ef359cf206dd231f8ee67b1566b59 100644 (file)
@@ -60,7 +60,7 @@
                                AssemblerListingLocation=".\..\..\..\win32\vc9\obj\__XQTNAM__/"
                                ObjectFile=".\..\..\..\win32\vc9\obj\__XQTNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win32\vc9\obj\__XQTNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DisableSpecificWarnings="4996"
                        />
                                AssemblerListingLocation=".\..\..\..\win32\vc9\objd\__XQTNAM__/"
                                ObjectFile=".\..\..\..\win32\vc9\objd\__XQTNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win32\vc9\objd\__XQTNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                                DisableSpecificWarnings="4996"
                                AssemblerListingLocation=".\..\..\..\win64\vc9\obj\__XQTNAM__/"
                                ObjectFile=".\..\..\..\win64\vc9\obj\__XQTNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win64\vc9\obj\__XQTNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DisableSpecificWarnings="4996"
                        />
                                AssemblerListingLocation=".\..\..\..\win64\vc9\objd\__XQTNAM__/"
                                ObjectFile=".\..\..\..\win64\vc9\objd\__XQTNAM__/"
                                ProgramDataBaseFileName=".\..\..\..\win64\vc9\objd\__XQTNAM__/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                                DisableSpecificWarnings="4996"