Commit aed9179e authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'hc' into 'master'

Fixed finders for IGM, PhySim and libQEx.



See merge request !18
parents 487b90a8 082358e1
......@@ -15,15 +15,22 @@ cmake_minimum_required(VERSION 2.8.9)
#if already found via finder or simulated finder in openmesh CMakeLists.txt, skip the search
IF (NOT IGM_FOUND)
file (
GLOB _libdirs
"${CMAKE_SOURCE_DIR}/libs"
"${CMAKE_SOURCE_DIR}/Package-*/libs"
)
SET (SEARCH_PATHS
/usr/local/
/usr/
"${CMAKE_SOURCE_DIR}/IGM/src/"
"${CMAKE_SOURCE_DIR}/libs/IGM/src/"
"${CMAKE_SOURCE_DIR}/../IGM/src/"
"${CMAKE_SOURCE_DIR}/"
"${CMAKE_SOURCE_DIR}/../"
"${CMAKE_SOURCE_DIR}/libs/"
"${_libdirs}"
)
FIND_PATH (IGM_INCLUDE_DIR IGM/QuadMeshGeneratorT.hh
FIND_PATH (IGM_INCLUDE_DIR IGM/src/IGM/QuadMeshGeneratorT.hh
PATHS ${SEARCH_PATHS}
PATH_SUFFIXES include)
......@@ -33,7 +40,7 @@ IF (NOT IGM_FOUND)
set(IGM_LIBRARIES ${IGM_LIBRARY})
set(IGM_INCLUDE_DIRS ${IGM_INCLUDE_DIR} )
set(IGM_INCLUDE_DIRS ${IGM_INCLUDE_DIR}/IGM/src )
#checks, if OPENMESH was found and sets OPENMESH_FOUND if so
include(FindPackageHandleStandardArgs)
......
......@@ -19,7 +19,7 @@ file (
)
FIND_PATH( PHYSIM_INCLUDE_DIRS PhySim/Config/PhySimDefines.hh
FIND_PATH(PHYSIM_INCLUDE_DIR PhySim/Config/PhySimDefines.hh
PATHS "${_libdirs}"
"${CMAKE_SOURCE_DIR}/libs" )
......@@ -32,13 +32,13 @@ else ()
endif ()
IF (PHYSIM_INCLUDE_DIRS)
IF (PHYSIM_INCLUDE_DIR)
SET(PHYSIM_FOUND TRUE)
SET( PHYSIM_LIBRARY_DIR "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}" )
SET( PHYSIM_LIBRARY "PhySim")
file(RELATIVE_PATH rel_path ${CMAKE_SOURCE_DIR} ${PHYSIM_INCLUDE_DIRS})
list (APPEND PHYSIM_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/${rel_path}/PhySim")
ELSE (PHYSIM_INCLUDE_DIRS)
file(RELATIVE_PATH rel_path ${CMAKE_SOURCE_DIR} ${PHYSIM_INCLUDE_DIR})
SET(PHYSIM_INCLUDE_DIRS "${PHYSIM_INCLUDE_DIR}" "${CMAKE_BINARY_DIR}/${rel_path}/PhySim")
ELSE (PHYSIM_INCLUDE_DIR)
SET( PHYSIM_FOUND FALSE )
SET( PHYSIM_LIBRARY_DIR )
ENDIF (PHYSIM_INCLUDE_DIRS)
ENDIF (PHYSIM_INCLUDE_DIR)
......@@ -31,10 +31,16 @@ IF (QEX_INCLUDE_DIRS)
SET(QEX_FIND_QUIETLY TRUE)
ENDIF (QEX_INCLUDE_DIRS)
file (
GLOB _libdirs
"${CMAKE_SOURCE_DIR}/libs/QEx/interfaces/c"
"${CMAKE_SOURCE_DIR}/Package-*/libs/QEx/interfaces/c"
)
FIND_PATH(QEX_INCLUDE_DIR qex.h
PATHS /usr/local/include/QEx
/usr/include/QEx
"${CMAKE_SOURCE_DIR}/libs/QEx/interfaces/c"
"${_libdirs}"
)
SET(QEX_LIBRARY_DIR NOTFOUND CACHE PATH "The directory where the QEx libraries can be found.")
SET(SEARCH_PATHS
......
OpenMesh @ 0cd8fcb3
Subproject commit f650c05af86c7c74a51a744c90e47fe8601e3f64
Subproject commit 0cd8fcb3589e19bf88096444c326d8cb8e98fd66
OpenVolumeMesh @ 48a18b1b
Subproject commit 24f96b7c16f1c47db79bde712433cfc7e341da90
Subproject commit 48a18b1b5ed92908f679500f04910643e6ff498f
Supports Markdown
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