Commit 654c639b authored by Mike Kremer's avatar Mike Kremer

Moved OpenMesh sources to lib folder, adapted depending CMake config files.

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@13431 383ad7c9-94d9-4d36-a494-682f7c89f535
parent be43dc74
......@@ -28,6 +28,11 @@ if (NOT GLUT_FOUND)
message (FATAL_ERROR "GLUT not found!")
endif ()
find_package (OpenMesh)
if (NOT OPENMESH_FOUND)
message (FATAL_ERROR "OpenMesh not found!")
endif ()
find_package( Freetype)
if (NOT FREETYPE_FOUND)
......@@ -44,7 +49,7 @@ endif ()
if(FTGL_FOUND)
include_directories (
..
${CMAKE_SOURCE_DIR}/OpenMesh/src
${OPENMESH_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/ShaderUtils
${CMAKE_CURRENT_BINARY_DIR}
......@@ -57,7 +62,7 @@ if(FTGL_FOUND)
else(FTGL_FOUND)
include_directories (
..
${CMAKE_SOURCE_DIR}/OpenMesh/src
${OPENMESH_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/ShaderUtils
${CMAKE_CURRENT_BINARY_DIR}
......
......@@ -9,7 +9,6 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
include (ACGCommon)
acg_get_version (OpenFlipper)
acg_get_version (OpenMesh)
include (package)
include (ACGOutput)
......@@ -34,6 +33,11 @@ find_package (GLUT)
if (NOT GLUT_FOUND)
message (FATAL_ERROR "GLUT not found!")
endif ()
find_package (OpenMesh)
if (NOT OPENMESH_FOUND)
message (FATAL_ERROR "OpenMesh not found!")
endif ()
# ========================================================================
# Configure the executables path for tests
......@@ -51,8 +55,6 @@ SET(OPENFLIPPER_TEST_RESULTS ${CMAKE_BINARY_DIR}/tests/testResults )
# ========================================================================
# Core Library Components (Except the Core application)
# ========================================================================
add_subdirectory (OpenMesh/src/OpenMesh/Core)
add_subdirectory (OpenMesh/src/OpenMesh/Tools)
add_subdirectory (ACG)
add_subdirectory (OpenFlipper/PluginLib)
......
......@@ -2,7 +2,7 @@ include (ACGCommon)
include_directories (
..
${CMAKE_SOURCE_DIR}/OpenMesh/src
${OPENMESH_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
......
......@@ -19,7 +19,7 @@ endforeach ()
include_directories (
..
${CMAKE_SOURCE_DIR}/OpenMesh/src
${OPENMESH_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
......
......@@ -355,7 +355,7 @@ function (_build_openflipper_plugin plugin)
include_directories (
.
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/OpenMesh/src
${OPENMESH_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${${_PLUGIN}_DEPS_INCDIRS}
......
......@@ -17,6 +17,7 @@ FIND_PATH(OPENMESH_INCLUDE_DIR OpenMesh/Core/Mesh/PolyMeshT.hh
/usr/include
/usr/local/OpenMesh-2.0rc4/include
"${CMAKE_SOURCE_DIR}/OpenMesh/src"
"${CMAKE_SOURCE_DIR}/libs/OpenMesh/src"
"${CMAKE_SOURCE_DIR}/../OpenMesh/src"
/ACG/acgdev/gcc-4.0-x86_64/OM2/OpenMesh-2.0/installed/include
"C:\\Program Files\\OpenMesh 2.0\\include"
......
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