Verified Commit 2399b2ca authored by Tobias WEBER's avatar Tobias WEBER
Browse files

changed names of auxiliary tools

parent a09b1127
......@@ -341,7 +341,7 @@ add_executable(taspaths
if(BUILD_TEST_TOOLS)
add_executable(taspaths_hull
add_executable(taspaths-hull
src/tools/hull_main.cpp
src/tools/hull.cpp src/tools/hull.h
src/tools/vertex.cpp src/tools/vertex.h
......@@ -355,7 +355,7 @@ if(BUILD_TEST_TOOLS)
src/libs/voronoi.h
)
add_executable(taspaths_lines
add_executable(taspaths-lines
src/tools/lines_main.cpp
src/tools/lines.cpp src/tools/lines.h
src/tools/vertex.cpp src/tools/vertex.h
......@@ -370,7 +370,7 @@ if(BUILD_TEST_TOOLS)
src/libs/voronoi_lines.h
)
add_executable(taspaths_poly
add_executable(taspaths-poly
src/tools/poly_main.cpp
src/tools/poly.cpp src/tools/poly.h
src/tools/vertex.cpp src/tools/vertex.h
......@@ -410,21 +410,21 @@ if(QT_VER EQUAL 6)
if(BUILD_TEST_TOOLS)
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
target_link_options(taspaths_hull
target_link_options(taspaths-hull
PRIVATE LINKER:-sectcreate,__TEXT,__info_plist,${PROJECT_SOURCE_DIR}/setup/osx/hull.plist
)
target_link_options(taspaths_lines
target_link_options(taspaths-lines
PRIVATE LINKER:-sectcreate,__TEXT,__info_plist,${PROJECT_SOURCE_DIR}/setup/osx/lines.plist
)
target_link_options(taspaths_poly
target_link_options(taspaths-poly
PRIVATE LINKER:-sectcreate,__TEXT,__info_plist,${PROJECT_SOURCE_DIR}/setup/osx/poly.plist
)
endif()
target_link_libraries(taspaths_hull
target_link_libraries(taspaths-hull
"${Boost_LIBRARIES}"
"${Lapacke_LIBRARIES}"
"${Qhull_LIBRARIES}"
......@@ -432,7 +432,7 @@ if(QT_VER EQUAL 6)
Qt6::Svg
)
target_link_libraries(taspaths_lines
target_link_libraries(taspaths-lines
"${Boost_LIBRARIES}"
"${Lapacke_LIBRARIES}"
"${OVD_LIBRARIES}"
......@@ -443,7 +443,7 @@ if(QT_VER EQUAL 6)
Qt6::Svg
)
target_link_libraries(taspaths_poly
target_link_libraries(taspaths-poly
"${Boost_LIBRARIES}"
"${Lapacke_LIBRARIES}"
Qt6::Core Qt6::Gui Qt6::Widgets
......@@ -467,21 +467,21 @@ elseif(QT_VER EQUAL 5)
if(BUILD_TEST_TOOLS)
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
target_link_options(taspaths_hull
target_link_options(taspaths-hull
PRIVATE LINKER:-sectcreate,__TEXT,__info_plist,${PROJECT_SOURCE_DIR}/setup/osx/hull.plist
)
target_link_options(taspaths_lines
target_link_options(taspaths-lines
PRIVATE LINKER:-sectcreate,__TEXT,__info_plist,${PROJECT_SOURCE_DIR}/setup/osx/lines.plist
)
target_link_options(taspaths_poly
target_link_options(taspaths-poly
PRIVATE LINKER:-sectcreate,__TEXT,__info_plist,${PROJECT_SOURCE_DIR}/setup/osx/poly.plist
)
endif()
target_link_libraries(taspaths_hull
target_link_libraries(taspaths-hull
"${Boost_LIBRARIES}"
"${Lapacke_LIBRARIES}"
"${Qhull_LIBRARIES}"
......@@ -492,7 +492,7 @@ elseif(QT_VER EQUAL 5)
Qt5::Svg
)
target_link_libraries(taspaths_lines
target_link_libraries(taspaths-lines
"${Boost_LIBRARIES}"
"${Lapacke_LIBRARIES}"
"${OVD_LIBRARIES}"
......@@ -503,7 +503,7 @@ elseif(QT_VER EQUAL 5)
Qt5::Svg
)
target_link_libraries(taspaths_poly
target_link_libraries(taspaths-poly
"${Boost_LIBRARIES}"
"${Lapacke_LIBRARIES}"
Qt5::Core Qt5::Gui Qt5::Widgets
......
......@@ -69,9 +69,9 @@ if [ $create_appdir -ne 0 ]; then
# binaries
cp -v build/taspaths ${APPDIRNAME}/usr/local/bin
cp -v build/taspaths_lines ${APPDIRNAME}/usr/local/bin
cp -v build/taspaths_hull ${APPDIRNAME}/usr/local/bin
cp -v build/taspaths_poly ${APPDIRNAME}/usr/local/bin
cp -v build/taspaths-lines ${APPDIRNAME}/usr/local/bin
cp -v build/taspaths-hull ${APPDIRNAME}/usr/local/bin
cp -v build/taspaths-poly ${APPDIRNAME}/usr/local/bin
# libraries
cp -v build/*.so ${APPDIRNAME}/usr/local/lib
......
......@@ -160,9 +160,9 @@ if [ $create_appdir -ne 0 ]; then
# program files
cp -v setup/osx/Info.plist "${APPDIRNAME}/Contents/"
cp -v build/taspaths "${APPDIRNAME}/Contents/MacOS/"
cp -v build/taspaths_lines "${APPDIRNAME}/Contents/MacOS/"
cp -v build/taspaths_hull "${APPDIRNAME}/Contents/MacOS/"
cp -v build/taspaths_poly "${APPDIRNAME}/Contents/MacOS/"
cp -v build/taspaths-lines "${APPDIRNAME}/Contents/MacOS/"
cp -v build/taspaths-hull "${APPDIRNAME}/Contents/MacOS/"
cp -v build/taspaths-poly "${APPDIRNAME}/Contents/MacOS/"
# resources
cp -rv res/* "${APPDIRNAME}/Contents/Resources/"
......
......@@ -1430,9 +1430,9 @@ PathsTool::PathsTool(QWidget* pParent) : QMainWindow{pParent}
// tools menu
QMenu *menuTools = new QMenu("Tools", m_menubar);
fs::path hullpath = fs::path(g_apppath) / fs::path("taspaths_hull" EXEC_EXTENSION);
fs::path linespath = fs::path(g_apppath) / fs::path("taspaths_lines" EXEC_EXTENSION);
fs::path polypath = fs::path(g_apppath) / fs::path("taspaths_poly" EXEC_EXTENSION);
fs::path hullpath = fs::path(g_apppath) / fs::path("taspaths-hull" EXEC_EXTENSION);
fs::path linespath = fs::path(g_apppath) / fs::path("taspaths-lines" EXEC_EXTENSION);
fs::path polypath = fs::path(g_apppath) / fs::path("taspaths-poly" EXEC_EXTENSION);
std::size_t num_tools = 0;
if(fs::exists(linespath))
......
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