Changeset 10 in flair-dev for trunk/cmake-modules

Timestamp:

Apr 8, 2016, 11:21:28 AM (9 years ago)

Author:

Sanahuja Guillaume

Message:

correct bugs

Location:

trunk/cmake-modules

Files:

• FlairUseFile.cmake (modified) (1 diff)
• GlobalCmakeFlair.cmake (modified) (2 diffs)

trunk/cmake-modules/FlairUseFile.cmake

@@ -25 +25 @@
 )
 SET(FLAIR_LIBRARY_DIR
-        ${FLAIR_DEV}/lib/${ARCH_DIR}
+        ${FLAIR_BIN}/lib/${ARCH_DIR}
 )
 

trunk/cmake-modules/GlobalCmakeFlair.cmake

@@ -11 +11 @@
 if(NOT FLAIR_DEV)
         IF(FLAIR_DEV_TAG)
-                warn("Configuring flair-dev for tag ${FLAIR_DEV_TAG}")
+                warn("Configuring flair-dev and flair-bin for tag ${FLAIR_DEV_TAG}")
                 SET(FLAIR_DEV $ENV{FLAIR_ROOT}/flair-dev_svn/tags/${FLAIR_DEV_TAG})
+                SET(FLAIR_BIN $ENV{FLAIR_ROOT}/flair-bin_svn/tags/${FLAIR_DEV_TAG})
                 if(EXISTS "${FLAIR_DEV}/cmake-modules/GlobalCmakeUAV.cmake")
                         UNSET(FLAIR_DEV_TAG)
@@ -22 +23 @@
         ELSE()
                 SET(FLAIR_DEV $ENV{FLAIR_ROOT}/flair-dev)
+                SET(FLAIR_BIN $ENV{FLAIR_ROOT}/flair-bin)
         ENDIF()
 ENDIF()