[clblas] 10/125: Removing tplgen configure.bat which is not used anymore. Fixing linux build problem with path differences between gcc and msvc

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Fri May 29 06:57:17 UTC 2015


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository clblas.

commit b298b43db787307a11385b96aa22c9211de04992
Author: Kent Knox <kent.knox at amd>
Date:   Tue Aug 20 12:13:09 2013 -0500

    Removing tplgen configure.bat which is not used anymore.  Fixing linux build problem with path differences between gcc and msvc
---
 src/library/CMakeLists.txt             | 11 +++++++++--
 src/library/tools/tplgen/configure.bat | 14 --------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index 24e0d3f..61464ac 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -285,12 +285,19 @@ ExternalProject_Add( tplgen
 
 ExternalProject_Get_Property( tplgen binary_dir )
 
+set( tplgenBinaryDir "" )
+if( CMAKE_COMPILER_IS_GNUCXX )
+    set( tplgenBinaryDir ${binary_dir} )
+else()
+    set( tplgenBinaryDir "${binary_dir}/Debug" )
+endif()
+
 add_custom_target( GENERATE_CLT
-    COMMAND ${binary_dir}/Debug/tplgen -o ${clBLAS_BINARY_DIR}/include ${SRC_CL_TEMPLATES}
+    COMMAND ${tplgenBinaryDir}/tplgen -o ${clBLAS_BINARY_DIR}/include ${SRC_CL_TEMPLATES}
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/library/blas/gens/clTemplates
 )
 
-add_dependencies(GENERATE_CLT tplgen)
+add_dependencies( GENERATE_CLT tplgen )
 
 add_library(clBLAS SHARED ${CLBLAS_SOURCES} ${GLOBAL_HEADERS} ${SRC_BLAS_HEADERS} ${SRC_BLAS_GENS_HEADERS})
 add_dependencies(clBLAS GENERATE_CLT)
diff --git a/src/library/tools/tplgen/configure.bat b/src/library/tools/tplgen/configure.bat
deleted file mode 100644
index b1f3db6..0000000
--- a/src/library/tools/tplgen/configure.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-del CMakeCache.txt
-cmake -DCMAKE_BUILD_TYPE=debug -G "Visual Studio 10" ..\tplgen
-if NOT ERRORLEVEL 1 goto end
-IF ERRORLEVEL 4 goto try9
-IF ERRORLEVEL 3 goto try9
-IF ERRORLEVEL 2 goto try9
-IF ERRORLEVEL 1 goto try9
-goto end
-
-:try9
-del CMakeCache.txt
-cmake -DCMAKE_BUILD_TYPE=Debug -G "Visual Studio 9 2008" ..\tplgen
-
-:end
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clblas.git



More information about the debian-science-commits mailing list