[asl] 86/177: Renaming files
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Aug 27 09:22:44 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository asl.
commit 65fb6f9bfbf682a83730d393bdf80fae40fb96e7
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date: Fri Jul 10 10:35:07 2015 +0300
Renaming files
---
CMakeLists.txt | 9 +++++----
cmake/{DefineFunctions.cmake => ASLBuildFunctions.cmake} | 0
cmake/{DefineOptions.cmake => ASLBuildOptions.cmake} | 0
doc/CMakeLists.txt | 2 +-
doc/Developer-Guide/{Doxyfile.in => Doxyfile.cmake.in} | 0
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f40c40d..5afa1c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,11 +20,12 @@ endif()
# Enable supplied cmake includes and modules
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/" "${CMAKE_SOURCE_DIR}/cmake/Modules/")
-
-# Add definitions
-include(DefineOptions)
-include(DefineFunctions)
+
include(GNUInstallDirs)
+
+# Add ASL definitions
+include(ASLBuildOptions)
+include(ASLBuildFunctions)
# Find dependencies
find_package(OpenCL 1.1 REQUIRED)
diff --git a/cmake/DefineFunctions.cmake b/cmake/ASLBuildFunctions.cmake
similarity index 100%
rename from cmake/DefineFunctions.cmake
rename to cmake/ASLBuildFunctions.cmake
diff --git a/cmake/DefineOptions.cmake b/cmake/ASLBuildOptions.cmake
similarity index 100%
rename from cmake/DefineOptions.cmake
rename to cmake/ASLBuildOptions.cmake
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 496c29b..889e15f 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -9,7 +9,7 @@ endif (DOXYGEN_DOT_FOUND)
# Configure Doxyfile
configure_file(
- "${PROJECT_SOURCE_DIR}/doc/Developer-Guide/Doxyfile.in"
+ "${PROJECT_SOURCE_DIR}/doc/Developer-Guide/Doxyfile.cmake.in"
"${PROJECT_BINARY_DIR}/doc/Developer-Guide/Doxyfile"
)
add_custom_target(docs ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/doc/Developer-Guide/Doxyfile)
diff --git a/doc/Developer-Guide/Doxyfile.in b/doc/Developer-Guide/Doxyfile.cmake.in
similarity index 100%
rename from doc/Developer-Guide/Doxyfile.in
rename to doc/Developer-Guide/Doxyfile.cmake.in
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git
More information about the debian-science-commits
mailing list