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

Moved ACG into subdir

parent 0814f42a
Pipeline #3871 failed with stage
in 23 minutes and 12 seconds
......@@ -182,6 +182,8 @@ if(NO_DECREMENT_DEPRECATED_WARNINGS)
add_definitions( -DNO_DECREMENT_DEPRECATED_WARNINGS )
endif()
find_package(ACG)
# OpenMesh is a dependent project (in libs_required) so no finder is needed.
if (NOT USE_INTERNAL_OPENMESH)
find_package (OpenMesh REQUIRED)
......@@ -284,7 +286,7 @@ endif()
# ========================================================================
# Core Library Components (Except the Core application)
# ========================================================================
add_subdirectory (ACG)
add_subdirectory (OpenFlipper/libs_required/ACG)
add_subdirectory (OpenFlipper/PluginLib)
# ========================================================================
......
......@@ -3,6 +3,7 @@ include (ACGCommon)
include_directories (
..
${OPENMESH_INCLUDE_DIRS}
${ACG_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
......
......@@ -37,6 +37,7 @@ file (
include_directories (
..
${PACKAGE_DIRS}
${ACG_INCLUDE_DIR}
${OPENMESH_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
......
......@@ -18,6 +18,7 @@ FIND_PATH(ACG_INCLUDE_DIR ACG/QtWidgets/QtBaseViewer.hh
PATHS /usr/local/include
/usr/include
"${CMAKE_SOURCE_DIR}/"
"${CMAKE_SOURCE_DIR}/OpenFlipper/libs_required/"
"${CMAKE_SOURCE_DIR}/../"
/ACG/acgdev/gcc-4.3-x86_64/OM2/ACG-2.0/include
)
......
......@@ -55,6 +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}/../OpenMesh/src/OpenMesh"
"C:/Program Files/OpenMesh 3.2"
"C:/Program Files/OpenMesh 3.1"
......
......@@ -480,6 +480,7 @@ function (_build_openflipper_plugin plugin)
.
${PACKAGE_DIRS}
${CMAKE_SOURCE_DIR}
${ACG_INCLUDE_DIR}
${OPENMESH_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
......
This diff is collapsed.
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