Changeset 2825 for trunk/CMakeLists.txt


Ignore:
Timestamp:
07/23/10 04:00:40 (14 years ago)
Author:
rorothetroll
Message:

fixe some cmake issues wth cygwin include and link dir

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r2824 r2825  
    9595set (OPTIONAL_INCLUDE_DIR "" CACHE STRING "Some optional include directories")
    9696
     97if (OSCamOperatingSystem MATCHES "Windows/Cygwin")
    9798include_directories (
    9899    ${CMAKE_CURRENT_SOURCE_DIR}/csctapi
     
    101102        ${CMAKE_CURRENT_SOURCE_DIR}/csgbox
    102103    endif[CS_WITH_GBOX]
    103     if (OSCamOperatingSystem MATCHES "Windows/Cygwin")
    104104        ${CMAKE_CURRENT_SOURCE_DIR}/cygwin
    105105        /usr/include/w32api
    106     endif (OSCamOperatingSystem MATCHES "Windows/Cygwin")
    107106    ${OPTIONAL_INCLUDE_DIR}
    108107    )
     108else (OSCamOperatingSystem MATCHES "Windows/Cygwin")
     109include_directories (
     110    ${CMAKE_CURRENT_SOURCE_DIR}/csctapi
     111    ${CMAKE_CURRENT_SOURCE_DIR}/cscrypt
     112    if[CS_WITH_GBOX]
     113        ${CMAKE_CURRENT_SOURCE_DIR}/csgbox
     114    endif[CS_WITH_GBOX]
     115    ${OPTIONAL_INCLUDE_DIR}
     116    )
     117endif (OSCamOperatingSystem MATCHES "Windows/Cygwin")
     118
     119if(OSCamOperatingSystem MATCHES "Windows/Cygwin")
    109120link_directories (
    110121    /usr/lib
     
    113124    ${OPTIONAL_LINK_DIR}
    114125    )
     126else (OSCamOperatingSystem MATCHES "Windows/Cygwin")
     127link_directories (
     128    ${OPTIONAL_LINK_DIR}
     129    )
     130endif (OSCamOperatingSystem MATCHES "Windows/Cygwin")
    115131
    116132#----------------------- global options ------------------------------
Note: See TracChangeset for help on using the changeset viewer.