Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-26 09:18:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15356 from NissimHadar/22096-addVHACDUtilToInstaller

Browse source 
Case 22096: Added vhacd-util and Oven to all installers.
This commit is contained in:
Sam Gondelman 2019-04-18 20:25:02 -07:00 committed by GitHub
commit 4f9911a655
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/oven/CMakeLists.txt
View file

@ -18,6 +18,4 @@ elseif (APPLE)
set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
endif()
if (BUILD_SERVER)
install_beside_console()
endif ()

6
tools/vhacd-util/CMakeLists.txt
View file

@ -12,7 +12,9 @@ target_link_libraries(${TARGET_NAME} ${VHACD_LIBRARIES})
setup_memory_debugger()
if (UNIX AND NOT APPLE)
if (WIN32)
package_libraries_for_deployment()
elseif (UNIX AND NOT APPLE)
include(FindOpenMP)
if(OPENMP_FOUND)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
@ -20,3 +22,5 @@ if (UNIX AND NOT APPLE)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
endif()
endif ()
install_beside_console()