Changeset 24 in flair-dev for trunk

Timestamp:

Jun 22, 2016, 5:05:15 PM (9 years ago)

Author:

Sanahuja Guillaume

Message:

m

File:

• trunk/scripts/cmake_codeblocks.sh (modified) (3 diffs)

trunk/scripts/cmake_codeblocks.sh

@@ -19 +19 @@
 
 #get cmake
-#if [ -f  ${OECORE_NATIVE_SYSROOT}/usr/bin/cmake ]; then
-#       CMAKE_NATIVE=${OECORE_NATIVE_SYSROOT}/usr/bin/cmake
-#else
-#       err "cross toolchain is not installed, please read https://devel.hds.utc.fr/projects/igep/wiki/toolchain/install"
-        CMAKE_NATIVE=cmake
-#fi
+CMAKE=${OECORE_HOST_NATIVE_SYSROOT}/usr/bin/cmake
 
 #verifie l'existence du lien symbolique build
@@ -48 +43 @@
 rm -f CMakeCache.txt
 rm -rf CMakeFiles
-cmake ../ -G "CodeBlocks - Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=${OECORE_CMAKE_HOST_TOOLCHAIN}
+${CMAKE} ../ -G "CodeBlocks - Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=${OECORE_CMAKE_HOST_TOOLCHAIN}
 # -DCMAKE_BUILD_TYPE=Release 
 
@@ -59 +54 @@
 rm -rf CMakeFiles
 
-$CMAKE_NATIVE ../ -G "CodeBlocks - Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=${OECORE_CMAKE_CROSS_TOOLCHAIN}
+${CMAKE} ../ -G "CodeBlocks - Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=${OECORE_CMAKE_CROSS_TOOLCHAIN}
 # -DCMAKE_BUILD_TYPE=Release