Changeset 35

Show
Ignore:
Timestamp:
03/09/08 12:44:35 (18 years ago)
Author:
mido
Message:

zasadni zmeny ve /win32

Files:
60 added
6 modified

Legend:

Unmodified
Added
Removed

  • CMakeLists.txt

    r31 r35  
    44project (BDM) 
    55 
    6  
    76# In order to be able to use the newly written FindXXX package, the  
    87# location of the FindXXX.cmake file must be added to the cmake modules  
    9 # list from within a CMakeLists.txt file as follows (assuming that 
    10 # FindFoo.cmake exists within a directory called cmake_modules within  
    11 # the top-level source directory): 
    12 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake_modules/") 
    13  
     8# list from within a CMakeLists.txt file as follows: 
     9set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}\\CMake_modules\\") 
    1410 
    1511###################### 
    1612#Platform specific 
    1713IF(WIN32) 
     14 
     15# IF YOU WANT TO USE YOUR OWN INSTALLATION OF ITTP AND/OR ACML LIBRARIES, 
     16# THEN IT IS NECESSARY TO CREATE TEXT FILE "\WIN32\LOCAL_PATHS.TXT" WITH  
     17# COPIES OF THE TWO FOLLOWING LINES AND THEN CORECT BOTH INVOLVED PATHS 
     18        SET(ITPP_DIR ".\\win32\\itpp-4.0.1") 
     19        SET(ACML_DIR ".\\win32\\acml3.6.0") 
     20 
     21        INCLUDE(\\win32\\local_paths.txt OPTIONAL)       
     22 
    1823        FIND_PACKAGE(ITPP REQUIRED) 
    1924        FIND_PACKAGE(ACML REQUIRED) 
    … …  
    2126        IF(ITPP_FOUND) 
    2227           INCLUDE_DIRECTORIES(${ITPP_INCLUDE_DIR}) 
     28           LINK_DIRECTORIES(${NATIVE_ITPP_LIB_PATH}) 
    2329        ENDIF(ITPP_FOUND) 
    2430 

  • CMake_modules/FindACML.cmake

    r31 r35  
    88#  ACML_LIBRARY, where to find the ACML library. 
    99 
    10  
    1110FIND_PATH(ACML_INCLUDE_DIR acml.h 
    12  C:\\Program Files\\AMD\\acml3.6.0\\pgi32\\include   
     11        "${ACML_DIR}\\pgi32\\include" 
    1312 ) 
    1413 
    1514FIND_LIBRARY(ACML_LIBRARY 
    1615  NAMES libacml_dll 
    17   PATHS C:\\Program Files\\AMD\\acml3.6.0\\pgi32\\lib 
     16  PATHS "${ACML_DIR}\\pgi32\\lib" 
    1817  ) 
    19  
    2018 
    2119IF (ACML_LIBRARY AND ACML_INCLUDE_DIR) 

  • CMake_modules/FindITPP.cmake

    r31 r35  
    88#  ITPP_LIBRARY, where to find the ITPP library. 
    99 
    10  
    1110FIND_PATH(ITPP_INCLUDE_DIR itpp/itbase.h 
    12   C:\\itpp-4.0.1 
     11        ${ITPP_DIR} 
    1312  ) 
    14  
    1513 
    1614FIND_LIBRARY(ITPP_LIBRARY 
    1715  NAMES itpp itpp_debug 
    18   PATHS C:\\itpp-4.0.1\\win32\\lib 
     16  PATHS "${ITPP_DIR}\\win32\\lib" 
    1917  ) 
    2018 

  • bdm/itpp_ext.cpp

    r32 r35  
    188188            /* (if q not positive go to step 8) */ 
    189189            if (q > 0.0) { 
    190                 w = expm1(q); 
     190                // TODO: w = expm1(q); 
     191                w = exp(q)-1; 
    191192                /*  ^^^^^ original code had approximation with rel.err < 2e-7 */ 
    192193                /* if t is rejected sample again at step 8 */ 

  • tests/CMakeLists.txt

    r33 r35  
    1010 
    1111IF(WIN32) 
    12         IF(ITPP_INCLUDE_DIR) 
    13                 include_directories(${ITPP_INCLUDE_DIR}) 
    14         ENDIF(ITPP_INCLUDE_DIR) 
    15         IF(ITPP_LIB_DIR) 
    16                 link_directories(${ITPP_LIB_DIR}) 
    17         ENDIF(ITPP_LIB_DIR) 
     12        SET(BdmLibs ${BdmLibs} libacml_dll) 
    1813ENDIF(WIN32) 
    1914 

  • tests/test0.cpp

    r32 r35  
    4949 
    5050        //Exit program: 
     51        getchar(); 
    5152        return 0; 
    5253