From a5aeb3b980585a6f2096f50b2c7e39e38a531f57 Mon Sep 17 00:00:00 2001 From: Kodey Date: Wed, 25 Feb 2015 08:45:00 +0530 Subject: [PATCH] cmake changes for building on linux --- cmake/modules/FindVHACD.cmake | 4 ++-- tools/vhacd/CMakeLists.txt | 14 +++++++++++++- tools/vhacd/src/VHACDUtil.cpp | 4 ++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/cmake/modules/FindVHACD.cmake b/cmake/modules/FindVHACD.cmake index d84ab30dff..f7eee44737 100644 --- a/cmake/modules/FindVHACD.cmake +++ b/cmake/modules/FindVHACD.cmake @@ -45,11 +45,11 @@ endmacro() find_path(VHACD_INCLUDE_DIRS VHACD.h PATH_SUFFIXES include HINTS ${VHACD_SEARCH_DIRS} $ENV{VHACD_ROOT_DIR}) -_FIND_VHACD_LIBRARY(VHACD VHACD_LIB) +_FIND_VHACD_LIBRARY(VHACD libVHACD.a) set(VHACD_LIBRARIES ${VHACD_LIBRARY}) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(VHACD "Could NOT find VHACD, try to set the path to VHACD root folder in the system variable VHACD_ROOT_DIR or create a directory vhacd in HIFI_LIB_DIR and paste the necessary files there" VHACD_INCLUDE_DIRS VHACD_LIBRARIES) -mark_as_advanced(VHACD_INCLUDE_DIRS VHACD_LIBRARIES VHACD_SEARCH_DIRS) \ No newline at end of file +mark_as_advanced(VHACD_INCLUDE_DIRS VHACD_LIBRARIES VHACD_SEARCH_DIRS) diff --git a/tools/vhacd/CMakeLists.txt b/tools/vhacd/CMakeLists.txt index ee82cd599d..51e15c8239 100644 --- a/tools/vhacd/CMakeLists.txt +++ b/tools/vhacd/CMakeLists.txt @@ -6,8 +6,20 @@ find_package(VHACD REQUIRED) target_include_directories(${TARGET_NAME} PUBLIC ${VHACD_INCLUDE_DIRS}) target_link_libraries(${TARGET_NAME} ${VHACD_LIBRARIES}) +if(NOT WIN32) + find_package( Threads) + target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT}) + + include(FindOpenMP) + if(OPENMP_FOUND) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}") + endif() +endif() + add_dependency_external_project(glm) find_package(GLM REQUIRED) target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) -include_dependency_includes() \ No newline at end of file +include_dependency_includes() diff --git a/tools/vhacd/src/VHACDUtil.cpp b/tools/vhacd/src/VHACDUtil.cpp index bfcdb74634..71ee2740c1 100644 --- a/tools/vhacd/src/VHACDUtil.cpp +++ b/tools/vhacd/src/VHACDUtil.cpp @@ -9,7 +9,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#include +#include #include "VHACDUtil.h" @@ -127,4 +127,4 @@ void vhacd::ProgressCallback::Update(const double overallProgress, const double } vhacd::ProgressCallback::ProgressCallback(void){} -vhacd::ProgressCallback::~ProgressCallback(){} \ No newline at end of file +vhacd::ProgressCallback::~ProgressCallback(){}