Changeset 469

Show
Ignore:
Timestamp:
08/04/09 10:51:00 (15 years ago)
Author:
vbarta
Message:

made to compile on Windows (again); tests fail

Location:
library
Files:
2 added
5 modified

Legend:

Unmodified
Added
Removed

  • library/system/SetBdmEnv.cmake

    r415 r469  
    9898        target_link_libraries (${FN} ${ARGN}) ## Additional libraries can be added to a macro 
    9999ENDMACRO(EXEC) 
     100 
     101MACRO(LINK_EXEC FN) 
     102        IF(WIN32) 
     103                target_link_libraries (${FN} debug itpp_debug) 
     104                target_link_libraries (${FN} optimized itpp) 
     105                target_link_libraries (${FN} libacml_dll) 
     106        ELSE(WIN32) 
     107                IF(APPLE) 
     108                        target_link_libraries (${FN} ${FRAMEWORK_VECLIB}) 
     109                ENDIF(APPLE) 
     110                target_link_libraries (${FN} itpp)       
     111        ENDIF(WIN32) 
     112        target_link_libraries (${FN} bdm) 
     113ENDMACRO(LINK_EXEC) 
    100114         
    101115MACRO(MEX FN) 

  • library/tests/CMakeLists.txt

    r468 r469  
    77link_directories (./unittest-cpp) 
    88 
    9 add_library(testutil egiw_harness.cpp egiw_harness.h epdf_harness.cpp epdf_harness.h mat_checks.cpp mat_checks.h mpdf_harness.cpp mpdf_harness.h square_mat_point.cpp square_mat_point.h test_util.cpp test_util.h) 
     9SET(testutil_src egiw_harness.cpp egiw_harness.h epdf_harness.cpp epdf_harness.h mat_checks.cpp mat_checks.h mpdf_harness.cpp mpdf_harness.h square_mat_point.cpp square_mat_point.h test_util.cpp test_util.h) 
     10 
     11IF(WIN32) 
     12   SET(testutil_src ${testutil_src} dirent.c dirent.h) 
     13ENDIF() 
     14 
     15add_library(testutil ${testutil_src}) 
    1016target_link_libraries(testutil bdm itpp unittest) 
    1117 
    1218add_executable(square_mat_stress square_mat_stress.cpp) 
    13 target_link_libraries(square_mat_stress bdm itpp testutil unittest) 
     19target_link_libraries(square_mat_stress testutil unittest) 
     20LINK_EXEC(square_mat_stress) 
    1421 
    1522add_executable(square_mat_prep additive_generator.cpp additive_generator.h generator.cpp generator.h size_generator.cpp size_generator.h square_mat_prep.cpp) 
    16 target_link_libraries(square_mat_prep bdm itpp testutil) 
     23target_link_libraries(square_mat_prep testutil) 
     24LINK_EXEC(square_mat_prep) 
    1725 
    1826EXEC(emix_test) 
    … …  
    3745# using UnitTest++ 
    3846add_executable(testsuite datalink_test.cpp egiw_test.cpp epdf_test.cpp loggers_test.cpp mpdf_test.cpp rv_test.cpp square_mat_test.cpp testsuite.cpp test_user_info.cpp test_shared_ptr.cpp) 
    39 target_link_libraries(testsuite bdm itpp testutil unittest) 
     47target_link_libraries(testsuite testutil unittest) 
     48LINK_EXEC(testsuite) 
    4049 
    4150add_subdirectory(tutorial) 

  • library/tests/epdf_harness.cpp

    r466 r469  
    8888        mat er = (smp * smp.T()) / nsamples - outer_product(emu, emu); 
    8989 
    90         vec delta = sqrt(variance) / sqrt(nsamples); 
     90        // simplify overloading for Visual Studio 
     91        vec delta = sqrt(variance) / sqrt(static_cast<double>(nsamples)); 
    9192        CHECK_CLOSE_EX(mean, emu, delta); 
    9293 
    … …  
    108109        vec emu = sum(smp, 2) / nsamples; 
    109110 
    110         vec delta = sqrt(variance) / sqrt(nsamples); 
     111        // simplify overloading for Visual Studio 
     112        vec delta = sqrt(variance) / sqrt(static_cast<double>(nsamples)); 
    111113        CHECK_CLOSE_EX(mean, emu, delta); 
    112114 

  • library/tests/loggers_test.cpp

    r425 r469  
    22#include "base/loggers.h" 
    33#include "test_util.h" 
     4#include "osutils.h" 
    45#include "UnitTest++.h" 
    56#include <string> 
    … …  
    1415    RV r = RV("{r }", "2"); 
    1516 
    16     if (mkdir("exp", 0777)) { 
     17    makedir(string("exp")); 
    1718        remove_all("exp/dirfile"); 
    18     } 
    1919 
    2020    dirfilelog L("exp/dirfile", 10); 

  • library/tests/test_util.cpp

    r449 r469  
    55#include <stdexcept> 
    66#include <string> 
    7 #include <dirent.h> 
    87#include <errno.h> 
    98#include <fcntl.h> 
    109#include <string.h> 
     10#include <stdio.h> 
    1111#include <sys/stat.h> 
    1212#include <sys/types.h> 
     13 
     14#ifdef WIN32 
     15#include "dirent.h" 
     16#include <direct.h> 
     17#define rmdir _rmdir 
     18#define unlink _unlink 
     19#else 
     20#include <dirent.h> 
    1321#include <unistd.h> 
     22#endif 
    1423 
    1524namespace bdm {