Skip to content
Snippets Groups Projects
Commit 2320ec51 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

introducing cmake: compiles, but does not yet link

parent 3240603f
No related branches found
No related tags found
No related merge requests found
......@@ -29,7 +29,7 @@ cd /tmp
rm $A
slink /git/f2/pub $A
tar czvfh ~/data/tgz/$A.tgz $A/* --exclude "autom4te.cache"
dl ~/data/tgz/f* # CHECK size
dl ~/data/tgz/frida2.* # CHECK size
rm $A
### rebuild
......
###########################################################################
# CMakeLists.txt file for building BornAgain framework
############################################################################
cmake_minimum_required(VERSION 2.8.3 FATAL_ERROR)
project(Frida)
# --- The version number ---
set(Frida_VERSION_MAJOR 2)
set(Frida_VERSION_MINOR 1)
set(Frida_VERSION_PATCH 9a)
# --- General project settings ---
#option(FRIDA_PYTHON "Build with python support" ON)
#option(FRIDA_APP "Build test application" OFF)
#option(FRIDA_GUI "Build a graphical user interface" OFF)
#option(FRIDA_MAN "Build a user manual" OFF)
#option(BUILD_DEBIAN "Build a debian package" OFF)
list( APPEND CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS} -g -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses -Werror")
find_package(Gnuplot)
find_package(BISON)
find_package(FLEX)
# --- Path for additional cmake modules ---
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
#--- Including macros ---
#include(FridaMacros)
#--- Recurse into the given subdirectories ---
add_subdirectory(src)
# packaging
# include(FridaCPack)
# BornAgain packaging
include(InstallRequiredSystemLibraries)
set(FRIDA_VERSION "${BornAgain_VERSION_MAJOR}.${BornAgain_VERSION_MINOR}.${BornAgain_VERSION_PATCH}")
set(CPACK_PACKAGE_NAME "Frida")
set(CPACK_PACKAGE_DESCRIPTION "Frida: fast reliable interactive data analysis.")
set(CPACK_PACKAGE_VENDOR "Forschungszentrum Juelich GmbH. Scientific Computing Group at MLZ Garching.")
set(CPACK_PACKAGE_VERSION ${FRIDA_VERSION})
set(CPACK_PACKAGE_VERSION_MAJOR ${BornAgain_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${BornAgain_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${BornAgain_VERSION_PATCH})
configure_file(COPYING LICENSE.txt COPYONLY)
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/LICENSE.txt")
# binary package setup
set(CPACK_PACKAGE_RELOCATABLE True)
if(CMAKE_BUILD_TYPE STREQUAL Release)
set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${FRIDA_VERSION}-${FRIDA_ARCHITECTURE}")
else()
set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${FRIDA_VERSION}-${FRIDA_ARCHITECTURE}-${CMAKE_BUILD_TYPE}")
endif()
set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_NAME}-${FRIDA_VERSION}")
if(WIN32)
include(CPackWindows)
elseif(APPLE)
include(CPackApple)
elseif(UNIX AND BUILD_DEBIAN) # one can build debian package only on UNIX system
include(CPackDebian)
else()
set(CPACK_GENERATOR "STGZ;TGZ")
endif()
# Generating the source package
set(CPACK_SOURCE_GENERATOR "TGZ")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
# Specify which files do not include into the source package generated by make package_source
set(CPACK_SOURCE_IGNORE_FILES
${CPACK_SOURCE_IGNORE_FILES} # first take the default parameters
"/Doc/UserManual/"
"/dev-tools/edit-scripts/"
"/dev-tools/packaging/"
"/dev-tools/tmp-examples/"
"/dev-tools/tmp-unsorted/"
"/GUI/"
"/XCode_BornAgain.xcodeproj/"
"~$"
"/.git/"
"/\\\\.git/"
"/\\\\\\\\.git/" # more screeneng symbols is neccesary because of double file processing by cmake and cpack
"\\\\\\\\.swp$"
"\\\\.swp$"
"/.metadata/"
"/.settings/"
"\\\\.cproject"
"\\\\.project"
"/\\\\.idea/"
"\\\\.lssrc"
"\\\\.gitignore"
"\\\\.DS_Store"
"\\\\.obj"
"CMakeLists.txt.user"
"/bin/release.sh.in" # user will not need it
"/cmake/modules/UseLATEX.cmake" # user will not need it
"/dev-tools/git-utils/cl_lines_of_code.py"
"/dev-tools/git-utils/qqq.png" # remove this line when unneeded
".pro$"
".pro.user$"
".pri$"
)
include(CPack)
set(CPACK_COMPONENTS_ALL Libraries Headers Examples)
file(GLOB src_files *.cpp)
file(GLOB inc_files *.hpp)
add_executable(frida ${src_files})
......@@ -17,7 +17,7 @@
#include <readplus/ask.hpp>
#include <readplus/readln.hpp>
#include "../config.h"
// #include "../config.h"
#include "defs.hpp"
#include "olf.hpp"
#include "mem.hpp"
......@@ -57,7 +57,8 @@ bool fridaCommand( string cmd )
if (cmd == "h" || cmd == "?") {
cout <<
"This is Frida, version " VERSION "\n"
// "This is Frida, version " VERSION "\n"
"This is Frida, version <version info disabled>\n"
"Plain commands:\n"
" a add to plot\n"
" p plot (g for list of other plot commands)\n"
......
......@@ -9,7 +9,8 @@
#include <vector>
#include <string>
#include <memory>
#include <math.h>
#include "defs.hpp"
#include "list.hpp"
......
......@@ -9,6 +9,8 @@
#include <vector>
#include <string>
#include <math.h>
#include <stdio.h>
#include <trivia/vector_ops.hpp>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment