From 76c49c64a14c53e3f58dc20dac9a851df18fd8e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 4 Jun 2009 09:38:36 +0000 Subject: [PATCH] Fixed missing getopt under windows with cmake git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@143 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Core/CMakeLists.txt | 72 +++++++++++++++---------------- src/OpenMesh/Tools/CMakeLists.txt | 66 +++++++++++++++------------- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/OpenMesh/Core/CMakeLists.txt b/src/OpenMesh/Core/CMakeLists.txt index dc6a3323..c1f0d703 100644 --- a/src/OpenMesh/Core/CMakeLists.txt +++ b/src/OpenMesh/Core/CMakeLists.txt @@ -1,38 +1,34 @@ -include (ACGCommon) - -include_directories ( - ../.. - ${CMAKE_CURRENT_SOURCE_DIR} -) - -# source code directories -set (directories - . - Geometry - IO - IO/exporter - IO/importer - IO/reader - IO/writer - Mesh - Mesh/gen - System - Utils -) - -# collect all header and source files -acg_append_files (headers "*.hh" ${directories}) -acg_append_files (sources "*.cc" ${directories}) - -IF(WIN32) - acg_append_files (sources "*.c" ${directories}) -ENDIF(WIN32) - -if (WIN32) - # OpenMesh has no dll exports so we have to build a static library on windows - acg_add_library (OpenMeshCore STATIC ${sources} ${headers}) -else () - acg_add_library (OpenMeshCore SHARED ${sources} ${headers}) -endif () - - +include (ACGCommon) + +include_directories ( + ../.. + ${CMAKE_CURRENT_SOURCE_DIR} +) + +# source code directories +set (directories + . + Geometry + IO + IO/exporter + IO/importer + IO/reader + IO/writer + Mesh + Mesh/gen + System + Utils +) + +# collect all header and source files +acg_append_files (headers "*.hh" ${directories}) +acg_append_files (sources "*.cc" ${directories}) + +if (WIN32) + # OpenMesh has no dll exports so we have to build a static library on windows + acg_add_library (OpenMeshCore STATIC ${sources} ${headers}) +else () + acg_add_library (OpenMeshCore SHARED ${sources} ${headers}) +endif () + + diff --git a/src/OpenMesh/Tools/CMakeLists.txt b/src/OpenMesh/Tools/CMakeLists.txt index f693d099..b99bdbc3 100644 --- a/src/OpenMesh/Tools/CMakeLists.txt +++ b/src/OpenMesh/Tools/CMakeLists.txt @@ -1,31 +1,35 @@ -include (ACGCommon) - -include_directories ( - ../.. - ${CMAKE_CURRENT_SOURCE_DIR} -) - -# source code directories -set (directories - . - Decimater - Smoother - Subdivider/Adaptive/Composite - Subdivider/Uniform/Composite - Subdivider/Uniform - Utils -) - -# collect all header and source files -acg_append_files (headers "*.hh" ${directories}) -acg_append_files (sources "*.cc" ${directories}) - -if (WIN32) - # OpenMesh has no dll exports so we have to build a static library on windows - acg_add_library (OpenMeshTools STATIC ${sources} ${headers}) -else () - acg_add_library (OpenMeshTools SHARED ${sources} ${headers}) -endif () - -target_link_libraries (OpenMeshTools OpenMeshCore) - +include (ACGCommon) + +include_directories ( + ../.. + ${CMAKE_CURRENT_SOURCE_DIR} +) + +# source code directories +set (directories + . + Decimater + Smoother + Subdivider/Adaptive/Composite + Subdivider/Uniform/Composite + Subdivider/Uniform + Utils +) + +# collect all header and source files +acg_append_files (headers "*.hh" ${directories}) +acg_append_files (sources "*.cc" ${directories}) + +IF(WIN32) + acg_append_files (sources "*.c" ${directories}) +ENDIF(WIN32) + +if (WIN32) + # OpenMesh has no dll exports so we have to build a static library on windows + acg_add_library (OpenMeshTools STATIC ${sources} ${headers}) +else () + acg_add_library (OpenMeshTools SHARED ${sources} ${headers}) +endif () + +target_link_libraries (OpenMeshTools OpenMeshCore) + -- GitLab