Changeset 218:9a495e91c66b in verona


Ignore:
Timestamp:
May 30, 2011 5:48:49 PM (2 years ago)
Author:
laurent@…
Branch:
default
Message:

add wcecompat include path instead of cutil

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • .hgsubstate

    r217 r218  
    11a1bd05cf1becfa567d269e68ab312ed4154d4ab2 libs/hlibpp 
    2 3f2b30b324053c25ffc358ba5e5e77f6c395d494 libs/miniini 
     2cb83411a9e6657814a3f0e0b5d96bbb132540511 libs/miniini 
    33d6e7191f6569742df0df30fe067a3b17e0380b07 libs/srtp 
    44eb39a86e3985369e8e316fa4c7780273b111d2be mediastreamer2 

  • libeXosip2/CMakeLists.txt

    r217 r218  
    5959  include_directories(include ${OSIP2_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/../libs/util/cutil/include/cutil/msvc) 
    6060else(WIN32 AND NOT CMAKE_UNDER_CE) 
    61   include_directories(include ${OSIP2_INCLUDE_DIRS}) 
     61        if(CMAKE_UNDER_CE) 
     62                include_directories(include ${OSIP2_INCLUDE_DIRS} ${WCECOMPAT_INCLUDE_DIRS}) 
     63        else(CMAKE_UNDER_CE) 
     64                include_directories(include ${OSIP2_INCLUDE_DIRS}) 
     65        endif(CMAKE_UNDER_CE) 
    6266endif(WIN32 AND NOT CMAKE_UNDER_CE) 
    6367link_directories(${OSIP2_LIBRARY_DIRS}) 

  • phapi/CMakeLists.txt

    r217 r218  
    127127if(WIN32 AND NOT CMAKE_UNDER_CE) 
    128128  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libs/util/cutil/include/cutil/msvc) 
     129else(WIN32 AND NOT CMAKE_UNDER_CE) 
     130        if(CMAKE_UNDER_CE) 
     131                include_directories(${WCECOMPAT_INCLUDE_DIRS}) 
     132        endif(CMAKE_UNDER_CE) 
    129133endif(WIN32 AND NOT CMAKE_UNDER_CE) 
    130134 

  • phtest/CMakeLists.txt

    r217 r218  
    99if(WIN32 AND NOT CMAKE_UNDER_CE) 
    1010  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libs/util/cutil/include/cutil/msvc) 
     11else(WIN32 AND NOT CMAKE_UNDER_CE) 
     12        if(CMAKE_UNDER_CE) 
     13                include_directories(${WCECOMPAT_INCLUDE_DIRS}) 
     14        endif(CMAKE_UNDER_CE) 
    1115endif(WIN32 AND NOT CMAKE_UNDER_CE) 
    1216 
Note: See TracChangeset for help on using the changeset viewer.