Commit 0e16bb12 authored by Jan Möbius's avatar Jan Möbius

Moved OpenMesh into libs_required subdirectory

parent a46a8671
Pipeline #3883 failed with stage
in 2 minutes and 20 seconds
[submodule "libs_required/OpenMesh"] [submodule "libs_required/OpenMesh"]
path = libs_required/OpenMesh path = OpenFlipper/libs_required/OpenMesh
url = https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh.git url = https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh.git
branch = master branch = master
[submodule "libs_required/OpenVolumeMesh"] [submodule "libs_required/OpenVolumeMesh"]
......
...@@ -215,6 +215,9 @@ enable_testing() ...@@ -215,6 +215,9 @@ enable_testing()
# Build all additional libraries # Build all additional libraries
# ======================================================================== # ========================================================================
add_subdirectory (OpenFlipper/libs_required/OpenMesh)
add_subdirectory (OpenFlipper/libs_required/ACG)
# search all libs in the libs directory # search all libs in the libs directory
# (required and optional libraries # (required and optional libraries
file ( file (
...@@ -286,7 +289,6 @@ endif() ...@@ -286,7 +289,6 @@ endif()
# ======================================================================== # ========================================================================
# Core Library Components (Except the Core application) # Core Library Components (Except the Core application)
# ======================================================================== # ========================================================================
add_subdirectory (OpenFlipper/libs_required/ACG)
add_subdirectory (OpenFlipper/PluginLib) add_subdirectory (OpenFlipper/PluginLib)
# ======================================================================== # ========================================================================
......
...@@ -33,7 +33,6 @@ file ( ...@@ -33,7 +33,6 @@ file (
"${CMAKE_SOURCE_DIR}/Package-*" "${CMAKE_SOURCE_DIR}/Package-*"
) )
include_directories ( include_directories (
.. ..
${PACKAGE_DIRS} ${PACKAGE_DIRS}
......
...@@ -55,7 +55,7 @@ IF (NOT OPENMESH_FOUND) ...@@ -55,7 +55,7 @@ IF (NOT OPENMESH_FOUND)
/usr/ /usr/
"${CMAKE_SOURCE_DIR}/OpenMesh/src/OpenMesh" "${CMAKE_SOURCE_DIR}/OpenMesh/src/OpenMesh"
"${CMAKE_SOURCE_DIR}/libs_required/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" "${CMAKE_SOURCE_DIR}/../OpenMesh/src/OpenMesh"
"C:/Program Files/OpenMesh 3.2" "C:/Program Files/OpenMesh 3.2"
"C:/Program Files/OpenMesh 3.1" "C:/Program Files/OpenMesh 3.1"
......
...@@ -21,6 +21,7 @@ http://openflipper.org/Documentation/latest/buildingOpenFlipper.html ...@@ -21,6 +21,7 @@ http://openflipper.org/Documentation/latest/buildingOpenFlipper.html
Latest NEWS Latest NEWS
=========== ===========
- 12/09/2016: Moved OpenMesh directory into OpenFlipper subdirectory OpenFlipper/libs_required/OpenMesh
- 12/09/2016: Moved ACG directory into OpenFlipper subdirectory OpenFlipper/libs_required/ACG - 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 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) - 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)
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