- Support building on FreeBSD
- Generate OpenMeshConfig.cmake Thanks to Thibault Payet for the patch
This commit is contained in:
@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
|
||||
set( CMAKE_CXX_STANDARD_REQUIRED TRUE )
|
||||
set( CMAKE_CXX_STANDARD 11 )
|
||||
|
||||
set(OpenMesh_RootDir ${CMAKE_CURRENT_LIST_DIR})
|
||||
|
||||
enable_testing()
|
||||
|
||||
# Only set project name if OpenMesh is built as stand-alone library
|
||||
@@ -133,7 +135,13 @@ else()
|
||||
set (OPENMESH_LIBRARY_DIR "${_OPENMESH_LIBRARY_DIR}" CACHE PATH "The directory where the OpenMesh libraries can be found.")
|
||||
endif()
|
||||
|
||||
add_subdirectory (Doc)
|
||||
if ( NOT DEFINED OPENMESH_DOCS )
|
||||
set( OPENMESH_DOCS false CACHE BOOL "Enable or disable building of documentation" )
|
||||
endif()
|
||||
|
||||
if (OPENMESH_DOCS)
|
||||
add_subdirectory (Doc)
|
||||
endif()
|
||||
|
||||
# ========================================================================
|
||||
# Bundle generation (Targets exist, now configure them)
|
||||
@@ -175,6 +183,20 @@ endif()
|
||||
|
||||
# ========================================================================
|
||||
|
||||
# Generate openmesh.pc file
|
||||
|
||||
set(DEST_DIR "${CMAKE_INSTALL_PREFIX}")
|
||||
set(PRIVATE_LIBS "-lOpenMeshCore -lOpenMeshTools")
|
||||
|
||||
configure_file("openmesh.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/openmesh.pc" @ONLY)
|
||||
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openmesh.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
|
||||
|
||||
# generate target file
|
||||
|
||||
install(EXPORT OpenMeshConfig DESTINATION share/OpenMesh/cmake)
|
||||
|
||||
export(TARGETS OpenMeshCore OpenMeshTools FILE OpenMeshConfig.cmake)
|
||||
|
||||
# display results
|
||||
acg_print_configure_header (OPENMESH "OpenMesh")
|
||||
|
||||
11
openmesh.pc.in
Normal file
11
openmesh.pc.in
Normal file
@@ -0,0 +1,11 @@
|
||||
prefix=@DEST_DIR@
|
||||
exec_prefix=${prefix}
|
||||
libdir=${prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: libOpenMesh
|
||||
Description: OpenMesh library
|
||||
Version: @OPENMESH_VERSION_MAJOR@.@OPENMESH_VERSION_MINOR@
|
||||
|
||||
Libs: -L${libdir} @PRIVATE_LIBS@
|
||||
Cflags: -I${includedir}
|
||||
@@ -132,4 +132,12 @@ install(DIRECTORY IO/
|
||||
PATTERN "Debian*" EXCLUDE )
|
||||
endif ()
|
||||
|
||||
target_include_directories(OpenMeshCore PUBLIC
|
||||
$<BUILD_INTERFACE:${OpenMesh_RootDir}/src>
|
||||
$<INSTALL_INTERFACE:include>)
|
||||
|
||||
install(TARGETS OpenMeshCore EXPORT OpenMeshConfig
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
|
||||
|
||||
@@ -115,4 +115,12 @@ install(FILES Utils/getopt.h DESTINATION include/OpenMesh/Tools/Utils)
|
||||
|
||||
endif ()
|
||||
|
||||
target_include_directories(OpenMeshTools PUBLIC
|
||||
$<BUILD_INTERFACE:${OpenMesh_RootDir}/src>
|
||||
$<INSTALL_INTERFACE:include>)
|
||||
|
||||
install(TARGETS OpenMeshTools EXPORT OpenMeshConfig
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
|
||||
|
||||
@@ -183,7 +183,7 @@ protected:
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------- gettimeofday ----
|
||||
#elif (defined(__GNUC__) || (defined(__INTEL_COMPILER) && !defined(WIN32))) && !defined(__MINGW32__)
|
||||
#elif (defined(__GNUC__) && !defined(__FreeBSD__) || (defined(__INTEL_COMPILER) && !defined(WIN32))) && !defined(__MINGW32__)
|
||||
|
||||
# include <sys/time.h>
|
||||
# include <sys/resource.h>
|
||||
@@ -271,7 +271,7 @@ Timer::Timer(void) :
|
||||
# else
|
||||
impl_ = new TimerImplPosix<CLOCK_REALTIME>;
|
||||
# endif
|
||||
#elif (defined(__GNUC__) || (defined(__INTEL_COMPILER) && !defined(WIN32)) ) && !defined(__MINGW32__)
|
||||
#elif (defined(__GNUC__) && !defined(__FreeBSD__) || (defined(__INTEL_COMPILER) && !defined(WIN32)) ) && !defined(__MINGW32__)
|
||||
impl_ = new TimerImplGToD;
|
||||
#else
|
||||
impl_ = new TimerImplStd;
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#endif
|
||||
|
||||
#elif defined __APPLE__
|
||||
#elif defined __APPLE__ || defined(__FreeBSD__)
|
||||
#include <unistd.h>
|
||||
#else
|
||||
#include <getopt.h>
|
||||
|
||||
Reference in New Issue
Block a user