If you are using GitLab outside of the ILL, then you will need to use HTTPS and not SSH for clone/push/pull operations. SSH will work normally if you are using the VPN.

Commit cb2fc974 authored by Tobias WEBER's avatar Tobias WEBER

make cleanup

parent 46c9e93a
......@@ -79,7 +79,8 @@ if(BUILD_FOR_MAC)
endif()
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}" "." "${PROJECT_SOURCE_DIR}/tlibs")
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}" "."
"${PROJECT_SOURCE_DIR}/cmake" "${PROJECT_SOURCE_DIR}/tlibs")
set(CMAKE_BINARY_DIR "${CMAKE_SOURCE_DIR}")
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/plugins")
......@@ -417,7 +418,7 @@ target_link_libraries(takin
# pre-build
add_custom_target(prebuild-script
COMMAND ${PROJECT_SOURCE_DIR}/prebuild.sh ${QT_UIC_EXECUTABLE} ${QT_MOC_EXECUTABLE} ${PROJECT_SOURCE_DIR}
COMMAND ${PROJECT_SOURCE_DIR}/setup/prebuild.sh ${QT_UIC_EXECUTABLE} ${QT_MOC_EXECUTABLE} ${PROJECT_SOURCE_DIR}
)
......
......@@ -26,10 +26,11 @@ For example, on *buntu systems, use the following commands:
Set up other external dependencies:
------------------------------
Set up dependencies
-------------------
* cd to Takin dir
* ./setup_externals.sh
* ./setup/setup_internals.sh
* ./setup/setup_externals.sh
......@@ -37,8 +38,8 @@ Set up other external dependencies:
Building Takin using the CMake path
-----------------------------------
Building Takin
--------------
Takin has to be compiled with a fully C++11 compliant compiler, e.g.:
......
#!/bin/bash
#
# cleans temporary files
# @author Tobias Weber <tobias.weber@tum.de>
# @license GPLv2
#
find bin -regex 'bin/[_a-zA-Z0-9]*' | xargs rm -f
rm -f bin/*.exe
rm -f plugins/*.so
rm -f plugins/*.dll
rm -f obj/*.o
rm -f ui/*.h
rm -f *.moc
rm -f libs/*.moc
rm -f tools/taz/*.moc
rm -f tools/res/*.moc
rm -f tools/scanviewer/*.moc
rm -f tools/scanpos/*.moc
rm -f tools/powderfit/*.moc
rm -f tools/monteconvo/*.moc
rm -f tools/sglist/*.moc
rm -f dialogs/*.moc
rm -f doc/takin.qch
rm -f doc/takin.qhc
rm -rf doc/devel/html
rm -f doc/devel/*.tmp
if [ -f Makefile ]
then
echo -e "\nCleaning stuff made by Makefile..."
make clean
fi
rm -f CMakeCache.txt
rm -rf CMakeFiles
#!/bin/bash
#
# cleans temporary files
# @author Tobias Weber <tobias.weber@tum.de>
# @license GPLv2
#
find bin -regex 'bin/[_a-zA-Z0-9]*' | xargs rm -fv
rm -fv bin/*.exe
rm -fv plugins/*.so
rm -fv plugins/*.dll
rm -fv obj/*.o
rm -fv ui/*.h
rm -fv *.moc
rm -fv libs/*.moc
rm -fv tools/taz/*.moc
rm -fv tools/res/*.moc
rm -fv tools/scanviewer/*.moc
rm -fv tools/scanpos/*.moc
rm -fv tools/powderfit/*.moc
rm -fv tools/monteconvo/*.moc
rm -fv tools/sglist/*.moc
rm -fv dialogs/*.moc
rm -fv doc/takin.qch
rm -fv doc/takin.qhc
rm -rfv doc/devel/html
rm -fv doc/devel/*.tmp
if [ -f Makefile ]
then
echo -e "\nCleaning stuff made by Makefile..."
make clean
fi
rm -fv CMakeCache.txt
rm -rfv CMakeFiles
rm -rfv build/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment