Skip to content
Snippets Groups Projects
Commit c9aef0f5 authored by Markus Blatt's avatar Markus Blatt
Browse files

adapt duneproject to latest changes.

[[Imported from SVN: r6959]]
parent 092ee83c
No related branches found
No related tags found
No related merge requests found
......@@ -313,7 +313,7 @@ echo "writing initial files:"
# we need the module with _ instead of - to not confuse automake
fix_and_assign CMODULE $MODULE
NAME=`echo $PROJECT | sed -e 's/dune[_-]//' | tr '-' '_'`
UNAME=`echo $PROJECT | tr '-' '_' | sed 's/\(.*\)/\U\1/'`
################## CONFIGURE.AC ##################
echo "- $PROJECT/configure.ac"
cat > "$PROJECT/configure.ac" <<C_DELIM
......@@ -465,11 +465,11 @@ M_DELIM
################## CMakeLists.txt ##################
echo " - $PROJECT/CMakeLists.txt"
cat> "$PROJECT/CMakeLists.txt" << M_DELIM
cmake_minimum_required(VERSION 2.8.8)
cmake_minimum_required(VERSION 2.8.9)
project($PROJECT CXX)
# for this to work you will have to modify the CMAKE_MODULE_PATH
#set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} "\${CMAKE_SOURCE_DIR}/cmake/modules")
#include the dune macros
include(DuneMacros)
......@@ -833,6 +833,18 @@ cat> "$PROJECT/config.h.cmake" <<EOF
/* end private */
/* Define to the version of $PROJECT */
#define ${UNAME}_VERSION "@${UNAME}_VERSION@"
/* Define to the major version of $PROJECT */
#define ${UNAME}_VERSION_MAJOR @${UNAME}_VERSION_MAJOR@
/* Define to the minor version of $PROJECT */
#define ${UNAME}_VERSION_MINOR @${UNAME}_VERSION_MINOR@
/* Define to the revision of $PROJECT */
#define ${UNAME}_VERSION_REVISION @${UNAME}_VERSION_REVISION@
/* end $NAME
Everything below here will be overwritten
*/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment