diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt index 8b7c025c..b7e16575 100644 --- a/Core/CMakeLists.txt +++ b/Core/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} ) +# source code directories set (directories . Geometry @@ -19,13 +20,21 @@ set (directories Utils ) +# collect all header and source files append_files (headers "*.hh" ${directories}) append_files (sources "*.cc" ${directories}) if (WIN32) -add_library (OpenMeshCore STATIC ${sources} ${headers}) + # OpenMesh has no dll exports so we have to build a static library on windows + add_library (OpenMeshCore STATIC ${sources} ${headers}) else () -add_library (OpenMeshCore SHARED ${sources} ${headers}) + add_library (OpenMeshCore SHARED ${sources} ${headers}) + # no install on mac, because the whole bundle will be installed in the + # toplevel CMakeLists.txt + if (NOT APPLE) + install (TARGETS OpenMeshCore DESTINATION ${OPENFLIPPER_LIBDIR}) + endif () endif () +# set common target properties defined in common.cmake set_target_props (OpenMeshCore) diff --git a/Tools/CMakeLists.txt b/Tools/CMakeLists.txt index 3ef11808..d201213a 100644 --- a/Tools/CMakeLists.txt +++ b/Tools/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} ) +# source code directories set (directories . Decimater @@ -15,15 +16,23 @@ set (directories Utils ) +# collect all header and source files append_files (headers "*.hh" ${directories}) append_files (sources "*.cc" ${directories}) if (WIN32) -add_library (OpenMeshTools STATIC ${sources} ${headers}) + # OpenMesh has no dll exports so we have to build a static library on windows + add_library (OpenMeshTools STATIC ${sources} ${headers}) else () -add_library (OpenMeshTools SHARED ${sources} ${headers}) + add_library (OpenMeshTools SHARED ${sources} ${headers}) + # no install on mac, because the whole bundle will be installed in the + # toplevel CMakeLists.txt + if (NOT APPLE) + install (TARGETS OpenMeshTools DESTINATION ${OPENFLIPPER_LIBDIR}) + endif () endif () target_link_libraries (OpenMeshTools OpenMeshCore) +# set common target properties defined in common.cmake set_target_props (OpenMeshTools)