diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d6e8870..c0cbda2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,10 +8,10 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) # include our cmake files include (ACGCommon) -include(OpenMeshPackage) - acg_get_version () +include(OpenMeshPackage) + include (ACGOutput) if (WIN32) diff --git a/cmake/OpenMeshpackage.cmake b/cmake/OpenMeshpackage.cmake index 963b0f4f..f8609d9b 100644 --- a/cmake/OpenMeshpackage.cmake +++ b/cmake/OpenMeshpackage.cmake @@ -17,7 +17,7 @@ set (CPACK_PACKAGE_VERSION "${OPENMESH_VERSION}") # addition package info set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenMesh") -set (CPACK_PACKAGE_EXECUTABLES "OpenMesh;") +#set (CPACK_PACKAGE_EXECUTABLES "DecimaterGui;SubdividerGui;QtViewer" "OpenMesh Decimater;OpenMesh Subdivider;OpenMesh Mesh Viewer") set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME}") set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") @@ -141,4 +141,4 @@ if (EXISTS "${CMAKE_BINARY_DIR}/CPackSourceConfig.cmake") add_custom_target (PACKAGE_SOURCE ${CMAKE_CPACK_COMMAND} --config "${CMAKE_BINARY_DIR}/CPackSourceConfig.cmake" ) -endif () +endif () \ No newline at end of file