Commit 4b3d1e8d authored by Jan Möbius's avatar Jan Möbius

Merge branch 'Move_OpenMesh' into 'master'

Moved OpenMesh into libs_required subdirectory

See merge request !208
parents 4916dee3 22d5c862
Pipeline #3891 failed with stage
in 48 minutes and 16 seconds
[submodule "libs_required/OpenMesh"]
path = libs_required/OpenMesh
path = OpenFlipper/libs_required/OpenMesh
url = https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh.git
branch = master
[submodule "libs_required/OpenVolumeMesh"]
......
......@@ -215,6 +215,9 @@ enable_testing()
# Build all additional libraries
# ========================================================================
add_subdirectory (OpenFlipper/libs_required/OpenMesh)
add_subdirectory (OpenFlipper/libs_required/ACG)
# search all libs in the libs directory
# (required and optional libraries
file (
......@@ -286,7 +289,6 @@ endif()
# ========================================================================
# Core Library Components (Except the Core application)
# ========================================================================
add_subdirectory (OpenFlipper/libs_required/ACG)
add_subdirectory (OpenFlipper/PluginLib)
# ========================================================================
......
rmdir libs_required\OpenMesh /s /q
git submodule init
git submodule update --remote
......
rmdir libs_required\OpenMesh /s /q
git submodule init
git submodule update --remote
......
rmdir libs_required\OpenMesh /s /q
git submodule init
git submodule update --remote
......
......@@ -58,6 +58,10 @@ fi
echo "Building with path: build-release-$BUILDPATH"
echo "Full cmake options: $OPTIONS "
########################################
# Build daemon cleanup code
########################################
rm -rf libs_required/OpenMesh
########################################
# Fetch submodules
......@@ -65,6 +69,11 @@ echo "Full cmake options: $OPTIONS "
git submodule init
git submodule update --remote
########################################
# Show information for easier debugging
########################################
git submodule status
ls OpenFlipper/libs_required/
########################################
# Fetch test data
......
########################################
# Build daemon cleanup code
########################################
rm -rf libs_required/OpenMesh
########################################
# Fetch submodules
......@@ -5,6 +10,12 @@
git submodule init
git submodule update --remote
########################################
# Show information for easier debugging
########################################
git submodule status
ls OpenFlipper/libs_required/
########################################
# Fetch test data
......
......@@ -33,7 +33,6 @@ file (
"${CMAKE_SOURCE_DIR}/Package-*"
)
include_directories (
..
${PACKAGE_DIRS}
......
......@@ -55,7 +55,7 @@ IF (NOT OPENMESH_FOUND)
/usr/
"${CMAKE_SOURCE_DIR}/OpenMesh/src/OpenMesh"
"${CMAKE_SOURCE_DIR}/libs_required/OpenMesh/src/OpenMesh"
"${CMAKE_SOURCE_DIR}/OpenFlipper/libs_required/OpenMesh/src/OpenMesh"
"${CMAKE_SOURCE_DIR}/OpenFlipper/libs_required/OpenMesh/src"
"${CMAKE_SOURCE_DIR}/../OpenMesh/src/OpenMesh"
"C:/Program Files/OpenMesh 3.2"
"C:/Program Files/OpenMesh 3.1"
......
......@@ -21,6 +21,8 @@ http://openflipper.org/Documentation/latest/buildingOpenFlipper.html
Latest NEWS
===========
- 12/09/2016: Moved OpenMesh directory into OpenFlipper subdirectory OpenFlipper/libs_required/OpenMesh
** You might have to delete your libs_required/OpenMesh directory manually if you get cmake errors regarding duplicate targets **
- 12/09/2016: Moved ACG directory into OpenFlipper subdirectory OpenFlipper/libs_required/ACG
- 12/08/2016: Moved CI directory into OpenFlipper subdirectory to remove toplevel dir count
- 12/08/2016: Moved the cmake directory contents into OpenFlipper/cmake (First steps to reduce number of toplevel dirs and get more modular than before)
......@@ -57,7 +57,7 @@ SET (CTEST_DROP_SITE_CDASH FALSE)
find_package(GoogleTest)
if(GTEST_FOUND)
add_subdirectory(${CMAKE_SOURCE_DIR}/libs_required/OpenMesh/src/Unittests ${CMAKE_BINARY_DIR}/libs_required/OpenMesh/src/Unittests)
add_subdirectory(${CMAKE_SOURCE_DIR}/OpenFlipper/libs_required/OpenMesh/src/Unittests ${CMAKE_BINARY_DIR}/OpenFlipper/libs_required/OpenMesh/src/Unittests)
endif()
endif()
......
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