Changeset 10 in flair-dev for trunk


Ignore:
Timestamp:
Apr 8, 2016, 11:21:28 AM (5 years ago)
Author:
Sanahuja Guillaume
Message:

correct bugs

Location:
trunk/cmake-modules
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/cmake-modules/FlairUseFile.cmake

    r2 r10  
    2525)
    2626SET(FLAIR_LIBRARY_DIR
    27         ${FLAIR_DEV}/lib/${ARCH_DIR}
     27        ${FLAIR_BIN}/lib/${ARCH_DIR}
    2828)
    2929
  • trunk/cmake-modules/GlobalCmakeFlair.cmake

    r2 r10  
    1111if(NOT FLAIR_DEV)
    1212        IF(FLAIR_DEV_TAG)
    13                 warn("Configuring flair-dev for tag ${FLAIR_DEV_TAG}")
     13                warn("Configuring flair-dev and flair-bin for tag ${FLAIR_DEV_TAG}")
    1414                SET(FLAIR_DEV $ENV{FLAIR_ROOT}/flair-dev_svn/tags/${FLAIR_DEV_TAG})
     15                SET(FLAIR_BIN $ENV{FLAIR_ROOT}/flair-bin_svn/tags/${FLAIR_DEV_TAG})
    1516                if(EXISTS "${FLAIR_DEV}/cmake-modules/GlobalCmakeUAV.cmake")
    1617                        UNSET(FLAIR_DEV_TAG)
     
    2223        ELSE()
    2324                SET(FLAIR_DEV $ENV{FLAIR_ROOT}/flair-dev)
     25                SET(FLAIR_BIN $ENV{FLAIR_ROOT}/flair-bin)
    2426        ENDIF()
    2527ENDIF()
Note: See TracChangeset for help on using the changeset viewer.