Skip to content

Commit

Permalink
version 1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
tweber-ill committed Jun 24, 2016
1 parent 8e50f35 commit a507630
Show file tree
Hide file tree
Showing 247 changed files with 52,408 additions and 1 deletion.
57 changes: 57 additions & 0 deletions .gitignore
@@ -0,0 +1,57 @@
*.o
*.moc
*.pyc
.~lock*
*~
.directory
*.kate-swp
ui/*.h
bin/*
!bin/.dir
perf.data
perf.data.old
gmon.out
Debug/*
Release/*
build/*
.clang/*
.codelite/*
.settings/*
takin.txt
takin.mk
montereso.txt
montereso.mk
monteconvo.txt
monteconvo.mk
scanviewer.txt
scanviewer.mk
CMakeFiles/*
CMakeCache.txt
cmake_install.cmake
FindQwt.cmake
Makefile
tlibs-master.tar.bz2
tlibs/*
tlibs
tango-icon-theme*.tar.gz
tmp/*
res/*
!res/brillouin.svg
!res/ellipses.svg
!res/goto.svg
!res/q.svg
*.htm
*.html
!doc/index_help.html
!doc/toc.html
!doc/takin.html
!doc/basics.html
!doc/reso.html
!doc/convo.html
!doc/fit.html
!doc/reso-sqw.html
!doc/reso-sqw-native.html
!doc/reso-sqw-py.html
takin.log
*.qch
*.qhc
1 change: 1 addition & 0 deletions AUTHORS
@@ -0,0 +1 @@
Tobias Weber <tobias.weber@tum.de>
224 changes: 224 additions & 0 deletions CMakeLists-dynamic.txt
@@ -0,0 +1,224 @@
#
# Takin
# @author tweber
# @date 2013-2016
# @license GPLv2
#

project(takin)
cmake_minimum_required(VERSION 3.0)

#set(CMAKE_VERBOSE_MAKEFILE TRUE)
set(CMAKE_BUILD_TYPE Release)


list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}" ".")
set(CMAKE_BINARY_DIR "${CMAKE_SOURCE_DIR}")
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")

find_package(Boost REQUIRED COMPONENTS iostreams system filesystem regex python REQUIRED)
find_package(Threads REQUIRED)
find_package(tlibs REQUIRED)
find_package(Qt4 REQUIRED)
find_package(PythonInterp 2.7 REQUIRED)
find_package(PythonLibs 2.7 REQUIRED)
find_package(PNG REQUIRED)
#find_package(JPEG REQUIRED)
#find_package(TIFF REQUIRED)
find_package(Qwt REQUIRED)
find_package(Clipper REQUIRED)

list(APPEND CMAKE_MODULE_PATH "${tlibs_SHARED_DIRS}")
find_package(Minuit2 REQUIRED)


#message("Project source dir: ${PROJECT_SOURCE_DIR}")
#message("CMake source dir: ${CMAKE_SOURCE_DIR}")
#message("Binary dir: ${CMAKE_BINARY_DIR}")
message("Install path prefix: ${CMAKE_INSTALL_PREFIX}")
message("Using qwt version ${QWT_MAJOR_VERSION}")
message("Qt moc: ${QT_MOC_EXECUTABLE}\nQt uic: ${QT_UIC_EXECUTABLE}")

add_definitions(-DNDEBUG)
add_definitions(-DUSE_NET -DUSE_IOSTR -DUSE_BOOST_REX -DUSE_PY -DUSE_GIL)
add_definitions(-DQT_VER=4 -DQWT_VER=${QWT_MAJOR_VERSION})
add_definitions(-DNO_LAPACK -DNO_3D -DNO_CLP)
add_definitions(-DNO_JPEG -DNO_TIFF)
add_definitions(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
add_definitions(${Boost_CXX_FLAGS})


include_directories("${PROJECT_SOURCE_DIR}" ".")
include_directories("${Boost_INCLUDE_DIRS}/..")
include_directories("${tlibs_INCLUDE_DIRS}/..")
include_directories("${PYTHON_INCLUDE_DIRS}")
include_directories("${PNG_INCLUDE_DIRS}")
#include_directories("${JPEG_INCLUDE_DIRS} ${TIFF_INCLUDE_DIRS}")
include_directories("${QWT_INCLUDE_DIRS}")
include_directories("${Minuit2_INCLUDE_DIRS}")


set(CMAKE_AUTOMOC OFF)
set(CMAKE_AUTOUIC OFF)

add_definitions(-std=c++11)
#add_definitions(-march=native -s)



# -----------------------------------------------------------------------------
# gentab
# -----------------------------------------------------------------------------
add_executable(gentab
tools/gentab/gentab.cpp
libs/spacegroups/spacegroup_clp.cpp libs/spacegroups/crystalsys.cpp
)

target_link_libraries(gentab
${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${Clipper_LIBRARIES} ${tlibs_LIBRARIES}
Qt4::QtCore Qt4::QtGui
)

add_custom_command(TARGET gentab POST_BUILD
COMMAND cd ${CMAKE_BINARY_DIR} && ./gentab
MAIN_DEPENDENCY gentab)
# -----------------------------------------------------------------------------



# -----------------------------------------------------------------------------
# takin
# -----------------------------------------------------------------------------
add_executable(takin
tools/taz/taz_main.cpp
tools/taz/taz.cpp tools/taz/tas_layout.cpp tools/taz/tof_layout.cpp
tools/taz/taz_crys.cpp
tools/taz/taz_file.cpp tools/taz/taz_export.cpp
tools/taz/tas_layout.cpp tools/taz/scattering_triangle.cpp
tools/taz/real_lattice.cpp tools/taz/proj_lattice.cpp
tools/taz/nicos.cpp tools/taz/sics.cpp tools/taz/taz_net.cpp

tools/res/cn.cpp tools/res/pop.cpp tools/res/eck.cpp tools/res/viol.cpp tools/res/simple.cpp
tools/res/ResoDlg.cpp

tools/monteconvo/ConvoDlg.cpp tools/monteconvo/SqwParamDlg.cpp tools/monteconvo/TASReso.cpp
tools/monteconvo/sqw.cpp tools/monteconvo/sqwbase.cpp tools/monteconvo/sqwfactory.cpp
tools/monteconvo/sqw_py.cpp

tools/convofit/scan.cpp
tools/scanviewer/scanviewer.cpp

dialogs/SettingsDlg.cpp dialogs/FilePreviewDlg.cpp
dialogs/GotoDlg.cpp dialogs/DWDlg.cpp dialogs/DynPlaneDlg.cpp
dialogs/NeutronDlg.cpp dialogs/SpurionDlg.cpp dialogs/PowderDlg.cpp
dialogs/DispDlg.cpp
dialogs/RecipParamDlg.cpp dialogs/RealParamDlg.cpp
dialogs/SrvDlg.cpp dialogs/NetCacheDlg.cpp
dialogs/EllipseDlg.cpp dialogs/FormfactorDlg.cpp
dialogs/AtomsDlg.cpp dialogs/AboutDlg.cpp

libs/spacegroups/spacegroup.cpp tools/sglist/SgListDlg.cpp
libs/globals.cpp libs/globals_qt.cpp libs/spacegroups/crystalsys.cpp
libs/formfactors/formfact.cpp libs/qthelper.cpp
# libs/plotgl.cpp tools/taz/recip3d.cpp dialogs/EllipseDlg3D.cpp
)

target_link_libraries(takin
${Boost_LIBRARIES} ${tlibs_LIBRARIES}
Threads::Threads
Qt4::QtCore Qt4::QtGui Qt4::QtSvg #Qt4::QtOpenGL
${PYTHON_LIBRARIES}
${PNG_LIBRARIES}
# ${JPEG_LIBRARIES} ${TIFF_LIBRARIES}
${QWT_LIBRARIES}
)


# pre-build
add_custom_target(prebuild-script
COMMAND ${PROJECT_SOURCE_DIR}/prebuild.sh ${QT_UIC_EXECUTABLE} ${QT_MOC_EXECUTABLE} ${PROJECT_SOURCE_DIR}
)


# post-build
#add_custom_command(TARGET takin POST_BUILD
# COMMAND qcollectiongenerator ${PROJECT_SOURCE_DIR}/doc/takin.qhcp -o ${PROJECT_SOURCE_DIR}/doc/takin.qhc
# && cp -v ${PROJECT_SOURCE_DIR}/doc/takin.qhc ${PROJECT_SOURCE_DIR}/res/
# && cp -v ${PROJECT_SOURCE_DIR}/doc/takin.qch ${PROJECT_SOURCE_DIR}/res/
# MAIN_DEPENDENCY takin)

if(CMAKE_BUILD_TYPE STREQUAL "Release")
add_custom_command(TARGET takin POST_BUILD
COMMAND strip -v $<TARGET_FILE:takin>
MAIN_DEPENDENCY takin
)
endif()


add_dependencies(takin prebuild-script)
add_dependencies(takin gentab)
# -----------------------------------------------------------------------------



# -----------------------------------------------------------------------------
# convofit, convoseries
# -----------------------------------------------------------------------------
add_executable(convofit
tools/res/cn.cpp tools/res/pop.cpp tools/res/eck.cpp tools/res/viol.cpp
#tools/res/simple.cpp

tools/monteconvo/TASReso.cpp
tools/monteconvo/sqw.cpp tools/monteconvo/sqwbase.cpp tools/monteconvo/sqwfactory.cpp
tools/monteconvo/sqw_py.cpp

tools/convofit/convofit.cpp
tools/convofit/model.cpp tools/convofit/scan.cpp
)

set_target_properties(convofit PROPERTIES COMPILE_FLAGS "-DNO_QT")

target_link_libraries(convofit
${tlibs_LIBRARIES} Threads::Threads
${Boost_LIBRARIES} ${Minuit2_LIBRARIES} ${PYTHON_LIBRARIES}
)

if(CMAKE_BUILD_TYPE STREQUAL "Release")
add_custom_command(TARGET convofit POST_BUILD
COMMAND strip -v $<TARGET_FILE:convofit>
MAIN_DEPENDENCY convofit
)
endif()
# -----------------------------------------------------------------------------

add_executable(convoseries
tools/convofit/scanseries.cpp
)

set_target_properties(convoseries PROPERTIES COMPILE_FLAGS "-DNO_QT")

target_link_libraries(convoseries
${tlibs_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}
)

if(CMAKE_BUILD_TYPE STREQUAL "Release")
add_custom_command(TARGET convoseries POST_BUILD
COMMAND strip -v $<TARGET_FILE:convoseries>
MAIN_DEPENDENCY convoseries
)
endif()
# -----------------------------------------------------------------------------




# -----------------------------------------------------------------------------
# install
# -----------------------------------------------------------------------------
install(TARGETS takin DESTINATION bin)
install(TARGETS convofit convoseries DESTINATION bin)
install(DIRECTORY ${PROJECT_SOURCE_DIR}/res ${PROJECT_SOURCE_DIR}/examples ${PROJECT_SOURCE_DIR}/doc
DESTINATION share/takin)
install(FILES ${PROJECT_SOURCE_DIR}/COPYING ${PROJECT_SOURCE_DIR}/AUTHORS ${PROJECT_SOURCE_DIR}/LICENSES
DESTINATION share/takin)
# -----------------------------------------------------------------------------
77 changes: 77 additions & 0 deletions CMakeLists-static-cli.txt
@@ -0,0 +1,77 @@
#
# Takin, cli client
# @author tweber
# @date 2014-2016
# @license GPLv2
#

project(takincli)
cmake_minimum_required(VERSION 3.0)

#set(CMAKE_VERBOSE_MAKEFILE TRUE)
set(CMAKE_BUILD_TYPE Release)


list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}" "." "${PROJECT_SOURCE_DIR}/tlibs")
set(CMAKE_BINARY_DIR "${CMAKE_SOURCE_DIR}")
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")

find_package(Boost REQUIRED COMPONENTS iostreams system filesystem regex REQUIRED)
find_package(Threads REQUIRED)

#message("Project source dir: ${PROJECT_SOURCE_DIR}")
#message("CMake source dir: ${CMAKE_SOURCE_DIR}")
#message("Binary dir: ${CMAKE_BINARY_DIR}")
message("Install path prefix: ${CMAKE_INSTALL_PREFIX}")

add_definitions(-DNDEBUG)
add_definitions(-DUSE_NET -DUSE_IOSTR -DUSE_BOOST_REX)
add_definitions(-DNO_LAPACK -DNO_3D -DNO_CLP -DNO_QT)
add_definitions(-DNO_JPEG -DNO_TIFF -DNO_PNG)
add_definitions(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
add_definitions(${Boost_CXX_FLAGS})
add_definitions(-DTLIBS_INC_HDR_IMPLS)


include_directories("${PROJECT_SOURCE_DIR}" ".")
include_directories("${Boost_INCLUDE_DIRS}/..")

add_definitions(-std=c++11)
#add_definitions(-march=native -s)


# -----------------------------------------------------------------------------
add_executable(takincli
tools/cli/cli_main.cpp

tools/res/cn.cpp tools/res/pop.cpp tools/res/eck.cpp tools/res/viol.cpp
tools/res/simple.cpp
tools/monteconvo/TASReso.cpp

# statically link to tlibs externals
tlibs/log/log.cpp
tlibs/math/rand.cpp
#tlibs/file/loadinstr.cpp
#tlibs/fit/minuit.cpp
#libs/globals.cpp
)

target_link_libraries(takincli
Threads::Threads ${Boost_LIBRARIES}
)

if(CMAKE_BUILD_TYPE STREQUAL "Release")
add_custom_command(TARGET takincli POST_BUILD
COMMAND strip -v $<TARGET_FILE:takincli>
MAIN_DEPENDENCY takincli
)
endif()
# -----------------------------------------------------------------------------



# -----------------------------------------------------------------------------
# install
# -----------------------------------------------------------------------------
install(TARGETS takincli DESTINATION bin)
# -----------------------------------------------------------------------------

0 comments on commit a507630

Please sign in to comment.