Changeset 143

Show
Ignore:
Timestamp:
08/20/08 11:18:27 (16 years ago)
Author:
mido
Message:

odmazani par zbytku po XSD, znovuzapojeni Xercese, stale nelze zbuildovat blas_test, testUI vsak jiz zbuilduju

Files:
1 removed
3 modified

Legend:

Unmodified
Added
Removed

  • CMakeLists.txt

    r134 r143  
    1414# IF YOU WANT TO USE YOUR OWN INSTALLATION OF THE NEXT EXTERNAL LIBRARIES, 
    1515# THEN IT IS NECESSARY TO CREATE TEXT FILE "\WIN32\LOCAL_PATHS.TXT" WITH  
    16 # COPIES OF THE TWO FOLLOWING LINES AND THEN CORECT BOTH INVOLVED PATHS 
     16# COPIES OF THE TWO FOLLOWING LINES AND THEN CORECT ALL INVOLVED PATHS 
    1717        SET(ITPP_DIR "${BDM_SOURCE_DIR}\\win32\\itpp-4.0.1") 
    1818        SET(ACML_DIR "${BDM_SOURCE_DIR}\\win32\\acml3.6.0") 
    19         SET(XSD_DIR "${BDM_SOURCE_DIR}\\win32\\xsd-3.1.0-i686") 
    2019        SET(XERCES_DIR "${BDM_SOURCE_DIR}\\win32\\xerces-c_2_8_0-x86") 
    2120 
    … …  
    2928FIND_PACKAGE(ITPP REQUIRED) 
    3029FIND_PACKAGE(ACML COMPONENTS) 
    31 # FIND_PACKAGE(XSD REQUIRED) 
    32 # FIND_PACKAGE(XERCES REQUIRED) 
     30FIND_PACKAGE(XERCES REQUIRED) 
    3331 
    3432IF(ITPP_FOUND) 
    … …  
    4139        LINK_DIRECTORIES(${NATIVE_ACML_LIB_PATH}) 
    4240ENDIF(ACML_FOUND) 
    43  
    44 IF(XSD_FOUND) 
    45         INCLUDE_DIRECTORIES(${XSD_INCLUDE_DIR}) 
    46 ENDIF(XSD_FOUND) 
    4741 
    4842IF(XERCES_FOUND) 

  • bdm/CMakeLists.txt

    r129 r143  
    66SET(BdmUI userinfo.cpp userinfo.h) 
    77 
    8 add_library (bdm itpp_ext.cpp  osutils.cpp osutils.h ${BdmMath} ${BdmStat} ${BdmEstim}) 
     8add_library (bdm itpp_ext.cpp  osutils.cpp osutils.h ${BdmMath} ${BdmStat} ${BdmEstim} ${BdmUI}) 
    99 

  • tests/CMakeLists.txt

    r141 r143  
    4141add_executable (testKF_QR testKF_QR.cpp) 
    4242add_executable (testKF_QRexh testKF_QRexh.cpp) 
    43 #add_executable (testUI testUI.cpp) 
     43add_executable (testUI testUI.cpp) 
    4444 
    4545 
    … …  
    5353target_link_libraries (testKF_QR ${BdmLibs}) 
    5454target_link_libraries (testKF_QRexh ${BdmLibs}) 
    55 #target_link_libraries (testUI ${BdmLibs} ${XERCES_LIBRARIES}) 
    56  
    57  
    58 # experimental lines building an XSD's hello example  
    59  
    60 # add_executable (test_xsd_hello test_xsd_hello.cxx hello-pskel.hxx hello-pskel.cxx) 
    61 # target_link_libraries (test_xsd_hello ${BdmLibs} ${XERCES_LIBRARIES} ) 
    62 # SET(XSD_ARGS "cxx-parser") 
    63 # ADD_CUSTOM_COMMAND( 
    64 #    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/hello-pskel.hxx ${CMAKE_CURRENT_BINARY_DIR}/hello-pskel.cxx 
    65 #    COMMAND ${XSD_EXECUTABLE} 
    66 #    ARGS ${XSD_ARGS} ${CMAKE_CURRENT_SOURCE_DIR}/hello.xsd 
    67 #    MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/hello.xsd 
    68 # ) 
    69 #  
    70  
     55target_link_libraries (testUI ${BdmLibs} ${XERCES_LIBRARIES})