Merge pull request #46 from robertsdionne/develop

Kent Knox · Kent Knox · commit 51064571b529 · 2014-08-23T09:06:28.000-05:00
s/CMAKE_SOURCE_DIR/PROJECT_SOURCE_DIR/ in library/CMakeLists.txt.
diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
@@ -279,7 +279,7 @@ endif()
 
 include( ExternalProject )
 ExternalProject_Add( tplgen
-    URL "${CMAKE_SOURCE_DIR}/library/tools/tplgen"
+    URL "${PROJECT_SOURCE_DIR}/library/tools/tplgen"
     INSTALL_COMMAND ""
 )
 
@@ -294,7 +294,7 @@ endif()
 
 add_custom_target( GENERATE_CLT
     COMMAND ${tplgenBinaryDir}/tplgen -o ${clBLAS_BINARY_DIR}/include ${SRC_CL_TEMPLATES}
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/library/blas/gens/clTemplates
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/library/blas/gens/clTemplates
 )
 
 add_dependencies( GENERATE_CLT tplgen )

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ endif()`
`279`	`279`
`280`	`280`	`include( ExternalProject )`
`281`	`281`	`ExternalProject_Add( tplgen`
`282`		`- URL "${CMAKE_SOURCE_DIR}/library/tools/tplgen"`
	`282`	`+ URL "${PROJECT_SOURCE_DIR}/library/tools/tplgen"`
`283`	`283`	`INSTALL_COMMAND ""`
`284`	`284`	`)`
`285`	`285`
`@@ -294,7 +294,7 @@ endif()`
`294`	`294`
`295`	`295`	`add_custom_target( GENERATE_CLT`
`296`	`296`	`COMMAND ${tplgenBinaryDir}/tplgen -o ${clBLAS_BINARY_DIR}/include ${SRC_CL_TEMPLATES}`
`297`		`- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/library/blas/gens/clTemplates`
	`297`	`+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/library/blas/gens/clTemplates`
`298`	`298`	`)`
`299`	`299`
`300`	`300`	`add_dependencies( GENERATE_CLT tplgen )`