From d3299410427015ef59683ce4ea33d807a936295c Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Mon, 12 Dec 2011 09:53:04 -0800 Subject: Always using the convex decomposition stub for now. --- indra/cmake/LLConvexDecomposition.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/LLConvexDecomposition.cmake b/indra/cmake/LLConvexDecomposition.cmake index 8e44504782..1731853300 100644 --- a/indra/cmake/LLConvexDecomposition.cmake +++ b/indra/cmake/LLConvexDecomposition.cmake @@ -3,10 +3,10 @@ include(Prebuilt) set(LLCONVEXDECOMP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) -if (INSTALL_PROPRIETARY AND NOT STANDALONE) - use_prebuilt_binary(llconvexdecomposition) - set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition) -else (INSTALL_PROPRIETARY AND NOT STANDALONE) +# if (INSTALL_PROPRIETARY AND NOT STANDALONE) +# use_prebuilt_binary(llconvexdecomposition) +# set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition) +# else (INSTALL_PROPRIETARY AND NOT STANDALONE) use_prebuilt_binary(llconvexdecompositionstub) set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) -endif (INSTALL_PROPRIETARY AND NOT STANDALONE) +# endif (INSTALL_PROPRIETARY AND NOT STANDALONE) -- cgit v1.2.3 From ec52f62228ada7cbf482b6b29d069faa0cebc670 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Mon, 12 Dec 2011 10:02:12 -0800 Subject: Adding the ability to pull in the pathing library as a prebuilt dependency. --- indra/cmake/Havok.cmake | 52 ++++++++++++++++++++++++++++++++++++++++++ indra/cmake/LLPathingLib.cmake | 16 +++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 indra/cmake/Havok.cmake create mode 100644 indra/cmake/LLPathingLib.cmake (limited to 'indra/cmake') diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake new file mode 100644 index 0000000000..1b355792d0 --- /dev/null +++ b/indra/cmake/Havok.cmake @@ -0,0 +1,52 @@ +# -*- cmake -*- +include(Prebuilt) + +use_prebuilt_binary(havok) +set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/libraries/include/havok/Source) +if (CMAKE_BUILD_TYPE MATCHES "Debug") + set(HAVOK_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/libraries/i686-win32/lib/debug/havok) +else (CMAKE_BUILD_TYPE MATCHES "Debug") + set(HAVOK_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/libraries/i686-win32/lib/release/havok) +endif (CMAKE_BUILD_TYPE MATCHES "Debug") + +find_library(HK_BASE_LIB hkBase PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_COMPAT_LIB hkCompat PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_GEOMETRY_UTILITIES_LIB hkGeometryUtilities PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_INTERNAL_LIB hkInternal PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_SERIALIZE_LIB hkSerialize PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_SCENEDATA_LIB hkSceneData PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_PHYS_COLLIDE_LIB hkpCollide PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_PHYS_UTILITIES_LIB hkpUtilities PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_PHYS_CONSTRAINTSOLVER_LIB hkpConstraintSolver PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_PHYS_DYNAMICS_LIB hkpDynamics PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_PHYS_INTERNAL_LIB hkpInternal PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_AI_INTERNAL_LIB hkaiInternal PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_AI_PATHFINDING_LIB hkaiPathfinding PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_AI_AIPHYSICSBRIDGE_LIB hkaiaiphysicsbridge PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_PHYS_UTILITIES_LIB hkputilities PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_CD_INTERNAL_LIB hkcdinternal PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_PHYS_VEHICLE_LIB hkpVehicle PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_VISUALIZE_LIB hkVisualize PATHS ${HAVOK_LIBRARY_PATH}) +find_library(HK_AI_VISUALIZE_LIB hkaiVisualize PATHS ${HAVOK_LIBRARY_PATH}) + +set(HK_LIBRARIES + ${HK_BASE_LIB} + ${HK_COMPAT_LIB} + ${HK_GEOMETRY_UTILITIES_LIB} + ${HK_INTERNAL_LIB} + ${HK_SERIALIZE_LIB} + ${HK_SCENEDATA_LIB} + ${HK_PHYS_COLLIDE_LIB} + ${HK_PHYS_UTILITIES_LIB} + ${HK_PHYS_CONSTRAINTSOLVER_LIB} + ${HK_PHYS_DYNAMICS_LIB} + ${HK_PHYS_INTERNAL_LIB} + ${HK_AI_INTERNAL_LIB} + ${HK_AI_PATHFINDING_LIB} + ${HK_AI_AIPHYSICSBRIDGE_LIB} + ${HK_PHYS_UTILITIES_LIB} + ${HK_CD_INTERNAL_LIB} + ${HK_PHYS_VEHICLE_LIB} + ${HK_VISUALIZE_LIB} + ${HK_AI_VISUALIZE_LIB} +) diff --git a/indra/cmake/LLPathingLib.cmake b/indra/cmake/LLPathingLib.cmake new file mode 100644 index 0000000000..b92190ad0a --- /dev/null +++ b/indra/cmake/LLPathingLib.cmake @@ -0,0 +1,16 @@ +# -*- cmake -*- +include(Prebuilt) + +use_prebuilt_binary(llpathinglib) +set(LLPATHING_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/libraries/include) +if (CMAKE_BUILD_TYPE MATCHES "Debug") + set(LLPATHING_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) +else (CMAKE_BUILD_TYPE MATCHES "Debug") + set(LLPATHING_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) +endif (CMAKE_BUILD_TYPE MATCHES "Debug") + +find_library(LL_PATHING_LIB llpathinglib PATHS ${LLPATHING_LIBRARY_PATH}) + +set(LLPATHING_LIBRARIES + ${LL_PATHING_LIB} +) -- cgit v1.2.3 From a9233d4f5c4a0f7b4225a7e6dbc02c024eea7cd9 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Wed, 14 Dec 2011 15:20:15 -0800 Subject: Ensuring that the debug build use the debug libs and the release build use the release libs. --- indra/cmake/Havok.cmake | 144 ++++++++++++++++++++++++++++------------- indra/cmake/LLPathingLib.cmake | 16 +++-- 2 files changed, 109 insertions(+), 51 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake index 1b355792d0..949575709c 100644 --- a/indra/cmake/Havok.cmake +++ b/indra/cmake/Havok.cmake @@ -3,50 +3,106 @@ include(Prebuilt) use_prebuilt_binary(havok) set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/libraries/include/havok/Source) -if (CMAKE_BUILD_TYPE MATCHES "Debug") - set(HAVOK_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/libraries/i686-win32/lib/debug/havok) -else (CMAKE_BUILD_TYPE MATCHES "Debug") - set(HAVOK_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/libraries/i686-win32/lib/release/havok) -endif (CMAKE_BUILD_TYPE MATCHES "Debug") - -find_library(HK_BASE_LIB hkBase PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_COMPAT_LIB hkCompat PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_GEOMETRY_UTILITIES_LIB hkGeometryUtilities PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_INTERNAL_LIB hkInternal PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_SERIALIZE_LIB hkSerialize PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_SCENEDATA_LIB hkSceneData PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_PHYS_COLLIDE_LIB hkpCollide PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_PHYS_UTILITIES_LIB hkpUtilities PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_PHYS_CONSTRAINTSOLVER_LIB hkpConstraintSolver PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_PHYS_DYNAMICS_LIB hkpDynamics PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_PHYS_INTERNAL_LIB hkpInternal PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_AI_INTERNAL_LIB hkaiInternal PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_AI_PATHFINDING_LIB hkaiPathfinding PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_AI_AIPHYSICSBRIDGE_LIB hkaiaiphysicsbridge PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_PHYS_UTILITIES_LIB hkputilities PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_CD_INTERNAL_LIB hkcdinternal PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_PHYS_VEHICLE_LIB hkpVehicle PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_VISUALIZE_LIB hkVisualize PATHS ${HAVOK_LIBRARY_PATH}) -find_library(HK_AI_VISUALIZE_LIB hkaiVisualize PATHS ${HAVOK_LIBRARY_PATH}) + +set(HAVOK_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/libraries/i686-win32/lib/debug/havok) +set(HAVOK_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/libraries/i686-win32/lib/release/havok) + +find_library(HK_BASE_DEBUG_LIB hkBase PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_COMPAT_DEBUG_LIB hkCompat PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_GEOMETRY_UTILITIES_DEBUG_LIB hkGeometryUtilities PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_INTERNAL_DEBUG_LIB hkInternal PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_SERIALIZE_DEBUG_LIB hkSerialize PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_SCENEDATA_DEBUG_LIB hkSceneData PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_PHYS_COLLIDE_DEBUG_LIB hkpCollide PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_PHYS_UTILITIES_DEBUG_LIB hkpUtilities PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_PHYS_CONSTRAINTSOLVER_DEBUG_LIB hkpConstraintSolver PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_PHYS_DYNAMICS_DEBUG_LIB hkpDynamics PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_PHYS_INTERNAL_DEBUG_LIB hkpInternal PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_AI_INTERNAL_DEBUG_LIB hkaiInternal PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_AI_PATHFINDING_DEBUG_LIB hkaiPathfinding PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_AI_AIPHYSICSBRIDGE_DEBUG_LIB hkaiaiphysicsbridge PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_PHYS_UTILITIES_DEBUG_LIB hkputilities PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_CD_INTERNAL_DEBUG_LIB hkcdinternal PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_PHYS_VEHICLE_DEBUG_LIB hkpVehicle PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_VISUALIZE_DEBUG_LIB hkVisualize PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) +find_library(HK_AI_VISUALIZE_DEBUG_LIB hkaiVisualize PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) + +find_library(HK_BASE_RELEASE_LIB hkBase PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_COMPAT_RELEASE_LIB hkCompat PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_GEOMETRY_UTILITIES_RELEASE_LIB hkGeometryUtilities PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_INTERNAL_RELEASE_LIB hkInternal PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_SERIALIZE_RELEASE_LIB hkSerialize PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_SCENEDATA_RELEASE_LIB hkSceneData PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_PHYS_COLLIDE_RELEASE_LIB hkpCollide PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_PHYS_UTILITIES_RELEASE_LIB hkpUtilities PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_PHYS_CONSTRAINTSOLVER_RELEASE_LIB hkpConstraintSolver PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_PHYS_DYNAMICS_RELEASE_LIB hkpDynamics PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_PHYS_INTERNAL_RELEASE_LIB hkpInternal PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_AI_INTERNAL_RELEASE_LIB hkaiInternal PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_AI_PATHFINDING_RELEASE_LIB hkaiPathfinding PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_AI_AIPHYSICSBRIDGE_RELEASE_LIB hkaiaiphysicsbridge PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_PHYS_UTILITIES_RELEASE_LIB hkputilities PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_CD_INTERNAL_RELEASE_LIB hkcdinternal PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_PHYS_VEHICLE_RELEASE_LIB hkpVehicle PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_VISUALIZE_RELEASE_LIB hkVisualize PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) +find_library(HK_AI_VISUALIZE_RELEASE_LIB hkaiVisualize PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) set(HK_LIBRARIES - ${HK_BASE_LIB} - ${HK_COMPAT_LIB} - ${HK_GEOMETRY_UTILITIES_LIB} - ${HK_INTERNAL_LIB} - ${HK_SERIALIZE_LIB} - ${HK_SCENEDATA_LIB} - ${HK_PHYS_COLLIDE_LIB} - ${HK_PHYS_UTILITIES_LIB} - ${HK_PHYS_CONSTRAINTSOLVER_LIB} - ${HK_PHYS_DYNAMICS_LIB} - ${HK_PHYS_INTERNAL_LIB} - ${HK_AI_INTERNAL_LIB} - ${HK_AI_PATHFINDING_LIB} - ${HK_AI_AIPHYSICSBRIDGE_LIB} - ${HK_PHYS_UTILITIES_LIB} - ${HK_CD_INTERNAL_LIB} - ${HK_PHYS_VEHICLE_LIB} - ${HK_VISUALIZE_LIB} - ${HK_AI_VISUALIZE_LIB} + + debug ${HK_BASE_DEBUG_LIB} + optimized ${HK_BASE_RELEASE_LIB} + + debug ${HK_COMPAT_DEBUG_LIB} + optimized ${HK_COMPAT_RELEASE_LIB} + + debug ${HK_GEOMETRY_UTILITIES_DEBUG_LIB} + optimized ${HK_GEOMETRY_UTILITIES_RELEASE_LIB} + + debug ${HK_INTERNAL_DEBUG_LIB} + optimized ${HK_INTERNAL_RELEASE_LIB} + + debug ${HK_SERIALIZE_DEBUG_LIB} + optimized ${HK_SERIALIZE_RELEASE_LIB} + + debug ${HK_SCENEDATA_DEBUG_LIB} + optimized ${HK_SCENEDATA_RELEASE_LIB} + + debug ${HK_PHYS_COLLIDE_DEBUG_LIB} + optimized ${HK_PHYS_COLLIDE_RELEASE_LIB} + + debug ${HK_PHYS_UTILITIES_DEBUG_LIB} + optimized ${HK_PHYS_UTILITIES_RELEASE_LIB} + + debug ${HK_PHYS_CONSTRAINTSOLVER_DEBUG_LIB} + optimized ${HK_PHYS_CONSTRAINTSOLVER_RELEASE_LIB} + + debug ${HK_PHYS_DYNAMICS_DEBUG_LIB} + optimized ${HK_PHYS_DYNAMICS_RELEASE_LIB} + + debug ${HK_PHYS_INTERNAL_DEBUG_LIB} + optimized ${HK_PHYS_INTERNAL_RELEASE_LIB} + + debug ${HK_AI_INTERNAL_DEBUG_LIB} + optimized ${HK_AI_INTERNAL_RELEASE_LIB} + + debug ${HK_AI_PATHFINDING_DEBUG_LIB} + optimized ${HK_AI_PATHFINDING_RELEASE_LIB} + + debug ${HK_AI_AIPHYSICSBRIDGE_DEBUG_LIB} + optimized ${HK_AI_AIPHYSICSBRIDGE_RELEASE_LIB} + + debug ${HK_PHYS_UTILITIES_DEBUG_LIB} + optimized ${HK_PHYS_UTILITIES_RELEASE_LIB} + + debug ${HK_CD_INTERNAL_DEBUG_LIB} + optimized ${HK_CD_INTERNAL_RELEASE_LIB} + + debug ${HK_PHYS_VEHICLE_DEBUG_LIB} + optimized ${HK_PHYS_VEHICLE_RELEASE_LIB} + + debug ${HK_VISUALIZE_DEBUG_LIB} + optimized ${HK_VISUALIZE_RELEASE_LIB} + + debug ${HK_AI_VISUALIZE_DEBUG_LIB} + optimized ${HK_AI_VISUALIZE_RELEASE_LIB} ) diff --git a/indra/cmake/LLPathingLib.cmake b/indra/cmake/LLPathingLib.cmake index b92190ad0a..c108b33e8c 100644 --- a/indra/cmake/LLPathingLib.cmake +++ b/indra/cmake/LLPathingLib.cmake @@ -3,14 +3,16 @@ include(Prebuilt) use_prebuilt_binary(llpathinglib) set(LLPATHING_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/libraries/include) -if (CMAKE_BUILD_TYPE MATCHES "Debug") - set(LLPATHING_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) -else (CMAKE_BUILD_TYPE MATCHES "Debug") - set(LLPATHING_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) -endif (CMAKE_BUILD_TYPE MATCHES "Debug") -find_library(LL_PATHING_LIB llpathinglib PATHS ${LLPATHING_LIBRARY_PATH}) + +set(LLPATHING_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) +set(LLPATHING_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) + +find_library(LL_PATHING_DEBUG_LIB llpathinglib PATHS ${LLPATHING_DEBUG_LIBRARY_PATH}) +find_library(LL_PATHING_RELEASE_LIB llpathinglib PATHS ${LLPATHING_RELEASE_LIBRARY_PATH}) set(LLPATHING_LIBRARIES - ${LL_PATHING_LIB} + + debug ${LL_PATHING_DEBUG_LIB} + optimized ${LL_PATHING_RELEASE_LIB} ) -- cgit v1.2.3 From e4a1b12e7a9c4bb8cbc2a1e41fddb8cec5a1b1e0 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 15 Dec 2011 12:48:07 -0500 Subject: SH-2789 WIP - build without tcmalloc, force alignment in various places --- indra/cmake/FindGooglePerfTools.cmake | 2 ++ indra/cmake/GooglePerfTools.cmake | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 indra/cmake/FindGooglePerfTools.cmake mode change 100644 => 100755 indra/cmake/GooglePerfTools.cmake (limited to 'indra/cmake') diff --git a/indra/cmake/FindGooglePerfTools.cmake b/indra/cmake/FindGooglePerfTools.cmake old mode 100644 new mode 100755 index bb125d538e..1c785d3461 --- a/indra/cmake/FindGooglePerfTools.cmake +++ b/indra/cmake/FindGooglePerfTools.cmake @@ -64,3 +64,5 @@ MARK_AS_ADVANCED( PROFILER_LIBRARY GOOGLE_PERFTOOLS_INCLUDE_DIR ) + +SET(GOOGLE_PERFTOOLS_FOUND "NO") diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake old mode 100644 new mode 100755 index d9f91193be..2e96912769 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -29,7 +29,7 @@ if (GOOGLE_PERFTOOLS_FOUND) endif (GOOGLE_PERFTOOLS_FOUND) if (WINDOWS) - set(USE_GOOGLE_PERFTOOLS ON) + set(USE_GOOGLE_PERFTOOLS OFF) endif (WINDOWS) if (USE_GOOGLE_PERFTOOLS) -- cgit v1.2.3 From ba67b9359f13968b13b1facbb1e4c7948405b767 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 5 Jan 2012 17:37:02 -0500 Subject: SH-2789 WIP - allow building with or without tcmalloc, default to tcmalloc enabled --- indra/cmake/FindGooglePerfTools.cmake | 2 -- indra/cmake/GooglePerfTools.cmake | 38 ++++++++++++++++++++++++++--------- 2 files changed, 28 insertions(+), 12 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/FindGooglePerfTools.cmake b/indra/cmake/FindGooglePerfTools.cmake index 1c785d3461..bb125d538e 100755 --- a/indra/cmake/FindGooglePerfTools.cmake +++ b/indra/cmake/FindGooglePerfTools.cmake @@ -64,5 +64,3 @@ MARK_AS_ADVANCED( PROFILER_LIBRARY GOOGLE_PERFTOOLS_INCLUDE_DIR ) - -SET(GOOGLE_PERFTOOLS_FOUND "NO") diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 2e96912769..0c31d73655 100755 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -1,20 +1,32 @@ # -*- cmake -*- include(Prebuilt) +# If you want to enable or disable TCMALLOC in viewer builds, this is the place. +# set ON or OFF as desired. +set (USE_TCMALLOC ON) + if (STANDALONE) include(FindGooglePerfTools) else (STANDALONE) if (WINDOWS) - use_prebuilt_binary(tcmalloc) - set(TCMALLOC_LIBRARIES - debug libtcmalloc_minimal-debug - optimized libtcmalloc_minimal) + if (USE_TCMALLOC) + use_prebuilt_binary(tcmalloc) + set(TCMALLOC_LIBRARIES + debug libtcmalloc_minimal-debug + optimized libtcmalloc_minimal) + else (USE_TCMALLOC) + set(TCMALLOC_LIBRARIES) + endif (USE_TCMALLOC) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (WINDOWS) if (LINUX) - use_prebuilt_binary(tcmalloc) - set(TCMALLOC_LIBRARIES - tcmalloc) + if (USE_TCMALLOC) + use_prebuilt_binary(tcmalloc) + set(TCMALLOC_LIBRARIES + tcmalloc) + else (USE_TCMALLOC) + set(TCMALLOC_LIBRARIES) + endif (USE_TCMALLOC) set(PROFILER_LIBRARIES profiler) set(GOOGLE_PERFTOOLS_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) @@ -29,13 +41,19 @@ if (GOOGLE_PERFTOOLS_FOUND) endif (GOOGLE_PERFTOOLS_FOUND) if (WINDOWS) - set(USE_GOOGLE_PERFTOOLS OFF) + set(USE_GOOGLE_PERFTOOLS ON) endif (WINDOWS) -if (USE_GOOGLE_PERFTOOLS) +# Apparently buggy - LL_USE_TCMALLOC never gets set. Fix when we have time to test the +# corresponding source code. +if (USE_TCMALLOC) set(TCMALLOC_FLAG -ULL_USE_TCMALLOC=1) +else (USE_TCMALLOC) + set(TCMALLOC_FLAG -ULL_USE_TCMALLOC) +endif (USE_TCMALLOC) + +if (USE_GOOGLE_PERFTOOLS) include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR}) set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES} ${STACKTRACE_LIBRARIES} ${PROFILER_LIBRARIES}) else (USE_GOOGLE_PERFTOOLS) - set(TCMALLOC_FLAG -ULL_USE_TCMALLOC) endif (USE_GOOGLE_PERFTOOLS) -- cgit v1.2.3 From d3b0a1375509f772ec3ddbc790b5a5d9f4fa7594 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 5 Jan 2012 18:24:42 -0500 Subject: SH-2789 WIP - fix for linux build failure --- indra/cmake/GooglePerfTools.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 0c31d73655..834da6d9b8 100755 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -47,7 +47,7 @@ endif (WINDOWS) # Apparently buggy - LL_USE_TCMALLOC never gets set. Fix when we have time to test the # corresponding source code. if (USE_TCMALLOC) - set(TCMALLOC_FLAG -ULL_USE_TCMALLOC=1) + set(TCMALLOC_FLAG -ULL_USE_TCMALLOC) # was -ULL_USE_TCMALLOC=1 which makes no sense. else (USE_TCMALLOC) set(TCMALLOC_FLAG -ULL_USE_TCMALLOC) endif (USE_TCMALLOC) -- cgit v1.2.3 From bfe6e94f5388b887253ba77f633ae332affe9f92 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 6 Jan 2012 13:01:17 -0500 Subject: SH-2789 WIP - fixing the LL_USE_TCMALLOC code, make tests build with the same tcmalloc options as the sl executable --- indra/cmake/GooglePerfTools.cmake | 16 +++++++++------- indra/cmake/LLAddBuildTest.cmake | 9 +++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) mode change 100644 => 100755 indra/cmake/LLAddBuildTest.cmake (limited to 'indra/cmake') diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 834da6d9b8..09501e0406 100755 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -14,8 +14,10 @@ else (STANDALONE) set(TCMALLOC_LIBRARIES debug libtcmalloc_minimal-debug optimized libtcmalloc_minimal) + set(TCMALLOC_LINK_FLAGS "/INCLUDE:__tcmalloc") else (USE_TCMALLOC) set(TCMALLOC_LIBRARIES) + set(TCMALLOC_LINK_FLAGS) endif (USE_TCMALLOC) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (WINDOWS) @@ -44,13 +46,13 @@ if (WINDOWS) set(USE_GOOGLE_PERFTOOLS ON) endif (WINDOWS) -# Apparently buggy - LL_USE_TCMALLOC never gets set. Fix when we have time to test the -# corresponding source code. -if (USE_TCMALLOC) - set(TCMALLOC_FLAG -ULL_USE_TCMALLOC) # was -ULL_USE_TCMALLOC=1 which makes no sense. -else (USE_TCMALLOC) - set(TCMALLOC_FLAG -ULL_USE_TCMALLOC) -endif (USE_TCMALLOC) +if (USE_GOOGLE_PERFTOOLS) + if (USE_TCMALLOC) + set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1) + else (USE_TCMALLOC) + set(TCMALLOC_FLAG -ULL_USE_TCMALLOC) + endif (USE_TCMALLOC) +endif (USE_GOOGLE_PERFTOOLS) if (USE_GOOGLE_PERFTOOLS) include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR}) diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake old mode 100644 new mode 100755 index 08feab6e36..a6f69a09e9 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -205,6 +205,15 @@ FUNCTION(LL_ADD_INTEGRATION_TEST SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES COMPILE_FLAGS -I"${TUT_INCLUDE_DIR}") endif(STANDALONE) + if (WINDOWS) + SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} + PROPERTIES + LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS ${TCMALLOC_LINK_FLAGS}" + LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" + LINK_FLAGS_RELEASE "" + ) + endif (WINDOWS) + # Add link deps to the executable if(TEST_DEBUG) message(STATUS "TARGET_LINK_LIBRARIES(INTEGRATION_TEST_${testname} ${libraries})") -- cgit v1.2.3 From 7236b1f4f8b3c14fe18af3d0bd5ee131ea7103dc Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Fri, 6 Jan 2012 14:50:01 -0800 Subject: Removing the havok dependency from the viewer build as this is now resolved in the llpathinglib library itself. --- indra/cmake/Havok.cmake | 108 ------------------------------------------------ 1 file changed, 108 deletions(-) delete mode 100644 indra/cmake/Havok.cmake (limited to 'indra/cmake') diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake deleted file mode 100644 index 949575709c..0000000000 --- a/indra/cmake/Havok.cmake +++ /dev/null @@ -1,108 +0,0 @@ -# -*- cmake -*- -include(Prebuilt) - -use_prebuilt_binary(havok) -set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/libraries/include/havok/Source) - -set(HAVOK_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/libraries/i686-win32/lib/debug/havok) -set(HAVOK_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/libraries/i686-win32/lib/release/havok) - -find_library(HK_BASE_DEBUG_LIB hkBase PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_COMPAT_DEBUG_LIB hkCompat PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_GEOMETRY_UTILITIES_DEBUG_LIB hkGeometryUtilities PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_INTERNAL_DEBUG_LIB hkInternal PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_SERIALIZE_DEBUG_LIB hkSerialize PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_SCENEDATA_DEBUG_LIB hkSceneData PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_PHYS_COLLIDE_DEBUG_LIB hkpCollide PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_PHYS_UTILITIES_DEBUG_LIB hkpUtilities PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_PHYS_CONSTRAINTSOLVER_DEBUG_LIB hkpConstraintSolver PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_PHYS_DYNAMICS_DEBUG_LIB hkpDynamics PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_PHYS_INTERNAL_DEBUG_LIB hkpInternal PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_AI_INTERNAL_DEBUG_LIB hkaiInternal PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_AI_PATHFINDING_DEBUG_LIB hkaiPathfinding PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_AI_AIPHYSICSBRIDGE_DEBUG_LIB hkaiaiphysicsbridge PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_PHYS_UTILITIES_DEBUG_LIB hkputilities PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_CD_INTERNAL_DEBUG_LIB hkcdinternal PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_PHYS_VEHICLE_DEBUG_LIB hkpVehicle PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_VISUALIZE_DEBUG_LIB hkVisualize PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) -find_library(HK_AI_VISUALIZE_DEBUG_LIB hkaiVisualize PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) - -find_library(HK_BASE_RELEASE_LIB hkBase PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_COMPAT_RELEASE_LIB hkCompat PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_GEOMETRY_UTILITIES_RELEASE_LIB hkGeometryUtilities PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_INTERNAL_RELEASE_LIB hkInternal PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_SERIALIZE_RELEASE_LIB hkSerialize PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_SCENEDATA_RELEASE_LIB hkSceneData PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_PHYS_COLLIDE_RELEASE_LIB hkpCollide PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_PHYS_UTILITIES_RELEASE_LIB hkpUtilities PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_PHYS_CONSTRAINTSOLVER_RELEASE_LIB hkpConstraintSolver PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_PHYS_DYNAMICS_RELEASE_LIB hkpDynamics PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_PHYS_INTERNAL_RELEASE_LIB hkpInternal PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_AI_INTERNAL_RELEASE_LIB hkaiInternal PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_AI_PATHFINDING_RELEASE_LIB hkaiPathfinding PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_AI_AIPHYSICSBRIDGE_RELEASE_LIB hkaiaiphysicsbridge PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_PHYS_UTILITIES_RELEASE_LIB hkputilities PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_CD_INTERNAL_RELEASE_LIB hkcdinternal PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_PHYS_VEHICLE_RELEASE_LIB hkpVehicle PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_VISUALIZE_RELEASE_LIB hkVisualize PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) -find_library(HK_AI_VISUALIZE_RELEASE_LIB hkaiVisualize PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) - -set(HK_LIBRARIES - - debug ${HK_BASE_DEBUG_LIB} - optimized ${HK_BASE_RELEASE_LIB} - - debug ${HK_COMPAT_DEBUG_LIB} - optimized ${HK_COMPAT_RELEASE_LIB} - - debug ${HK_GEOMETRY_UTILITIES_DEBUG_LIB} - optimized ${HK_GEOMETRY_UTILITIES_RELEASE_LIB} - - debug ${HK_INTERNAL_DEBUG_LIB} - optimized ${HK_INTERNAL_RELEASE_LIB} - - debug ${HK_SERIALIZE_DEBUG_LIB} - optimized ${HK_SERIALIZE_RELEASE_LIB} - - debug ${HK_SCENEDATA_DEBUG_LIB} - optimized ${HK_SCENEDATA_RELEASE_LIB} - - debug ${HK_PHYS_COLLIDE_DEBUG_LIB} - optimized ${HK_PHYS_COLLIDE_RELEASE_LIB} - - debug ${HK_PHYS_UTILITIES_DEBUG_LIB} - optimized ${HK_PHYS_UTILITIES_RELEASE_LIB} - - debug ${HK_PHYS_CONSTRAINTSOLVER_DEBUG_LIB} - optimized ${HK_PHYS_CONSTRAINTSOLVER_RELEASE_LIB} - - debug ${HK_PHYS_DYNAMICS_DEBUG_LIB} - optimized ${HK_PHYS_DYNAMICS_RELEASE_LIB} - - debug ${HK_PHYS_INTERNAL_DEBUG_LIB} - optimized ${HK_PHYS_INTERNAL_RELEASE_LIB} - - debug ${HK_AI_INTERNAL_DEBUG_LIB} - optimized ${HK_AI_INTERNAL_RELEASE_LIB} - - debug ${HK_AI_PATHFINDING_DEBUG_LIB} - optimized ${HK_AI_PATHFINDING_RELEASE_LIB} - - debug ${HK_AI_AIPHYSICSBRIDGE_DEBUG_LIB} - optimized ${HK_AI_AIPHYSICSBRIDGE_RELEASE_LIB} - - debug ${HK_PHYS_UTILITIES_DEBUG_LIB} - optimized ${HK_PHYS_UTILITIES_RELEASE_LIB} - - debug ${HK_CD_INTERNAL_DEBUG_LIB} - optimized ${HK_CD_INTERNAL_RELEASE_LIB} - - debug ${HK_PHYS_VEHICLE_DEBUG_LIB} - optimized ${HK_PHYS_VEHICLE_RELEASE_LIB} - - debug ${HK_VISUALIZE_DEBUG_LIB} - optimized ${HK_VISUALIZE_RELEASE_LIB} - - debug ${HK_AI_VISUALIZE_DEBUG_LIB} - optimized ${HK_AI_VISUALIZE_RELEASE_LIB} -) -- cgit v1.2.3 From c0fffdea8812e5eed8da9f341d3bfc9590301ada Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 12 Jan 2012 16:11:06 -0500 Subject: SH-2789 WIP --- indra/cmake/GooglePerfTools.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 09501e0406..73b3642ae6 100755 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -3,7 +3,7 @@ include(Prebuilt) # If you want to enable or disable TCMALLOC in viewer builds, this is the place. # set ON or OFF as desired. -set (USE_TCMALLOC ON) +set (USE_TCMALLOC OFF) if (STANDALONE) include(FindGooglePerfTools) -- cgit v1.2.3 From 3b6606eed8b04783f8b80df71e4fe24f7432bde5 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 19 Jan 2012 12:04:42 -0500 Subject: PATH-180 FIX? updating to latest pathing lib, and ensuring order invariance Grabbing latest packaged pathing library, and adding linker flags to deal with circular dependencies.` --- indra/cmake/LLPathingLib.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/cmake') diff --git a/indra/cmake/LLPathingLib.cmake b/indra/cmake/LLPathingLib.cmake index c108b33e8c..8e622d83db 100644 --- a/indra/cmake/LLPathingLib.cmake +++ b/indra/cmake/LLPathingLib.cmake @@ -16,3 +16,8 @@ set(LLPATHING_LIBRARIES debug ${LL_PATHING_DEBUG_LIB} optimized ${LL_PATHING_RELEASE_LIB} ) + +if (LINUX) + list(INSERT LLPATHING_LIBRARIES 0 -Wl,--start-group) + list(APPEND LLPATHING_LIBRARIES -Wl,--end-group) +endif (LINUX) -- cgit v1.2.3 From e2ef5a5edce6a01724d91fde5b471b0bae18d045 Mon Sep 17 00:00:00 2001 From: prep Date: Thu, 19 Jan 2012 14:38:16 -0500 Subject: Path-196 : vbo cleanup, visual fixes (path-222) --- indra/cmake/00-Common.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 98eeed09b3..9db0f4fff8 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -180,7 +180,7 @@ if (LINUX) # this stops us requiring a really recent glibc at runtime add_definitions(-fno-stack-protector) # linking can be very memory-hungry, especially the final viewer link - set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory") + set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory,FORCE:MULTIPLE") endif (NOT STANDALONE) endif (VIEWER) -- cgit v1.2.3 From 3dafd81173f492938c0083b20fe8e3f6362b4866 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Fri, 20 Jan 2012 11:41:47 -0500 Subject: PATH-180, BUILDFIX removing extraneous FORCE:MULTIPLE to fix the linux build. --- indra/cmake/00-Common.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 9db0f4fff8..98eeed09b3 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -180,7 +180,7 @@ if (LINUX) # this stops us requiring a really recent glibc at runtime add_definitions(-fno-stack-protector) # linking can be very memory-hungry, especially the final viewer link - set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory,FORCE:MULTIPLE") + set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory") endif (NOT STANDALONE) endif (VIEWER) -- cgit v1.2.3 From 9c66ac87fd46db3987e60ae50989b2497099480b Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Fri, 20 Jan 2012 18:06:32 +0100 Subject: STORM-276 Basic spellchecking framework --- indra/cmake/Copy3rdPartyLibs.cmake | 3 +++ indra/cmake/ViewerMiscLibs.cmake | 1 + 2 files changed, 4 insertions(+) (limited to 'indra/cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 394db362b1..ebeae3e5be 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -41,6 +41,7 @@ if(WINDOWS) libeay32.dll libcollada14dom22-d.dll glod.dll + libhunspell.dll ) set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") @@ -53,6 +54,7 @@ if(WINDOWS) libeay32.dll libcollada14dom22.dll glod.dll + libhunspell.dll ) if(USE_GOOGLE_PERFTOOLS) @@ -215,6 +217,7 @@ elseif(DARWIN) libllqtwebkit.dylib libminizip.a libndofdev.dylib + libhunspell-1.3.dylib libexception_handler.dylib libcollada14dom.dylib ) diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index df013b1665..f907181929 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -2,6 +2,7 @@ include(Prebuilt) if (NOT STANDALONE) + use_prebuilt_binary(libhunspell) use_prebuilt_binary(libuuid) use_prebuilt_binary(slvoice) use_prebuilt_binary(fontconfig) -- cgit v1.2.3 From e0f919711034ee4a112ae4b583486693bc104a7b Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 25 Jan 2012 14:58:47 -0500 Subject: Fix for build failures when tcmalloc disabled --- indra/cmake/Copy3rdPartyLibs.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 394db362b1..8e5d901779 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -55,10 +55,10 @@ if(WINDOWS) glod.dll ) - if(USE_GOOGLE_PERFTOOLS) + if(USE_TCMALLOC) set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll) set(release_files ${release_files} libtcmalloc_minimal.dll) - endif(USE_GOOGLE_PERFTOOLS) + endif(USE_TCMALLOC) if (FMOD) set(debug_files ${debug_files} fmod.dll) -- cgit v1.2.3 From 739358779267413887a57d2a6d6b651312245495 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Wed, 25 Jan 2012 18:46:19 -0500 Subject: PATH-192 WIP adding convex decomp to pathing First pass at using new llPhysicsExtensions library which combines pathing and convex decomp. --- indra/cmake/CMakeLists.txt | 2 +- indra/cmake/LLConvexDecomposition.cmake | 12 ------------ indra/cmake/LLPathingLib.cmake | 23 ----------------------- indra/cmake/LLPhysicsExtensions.cmake | 31 +++++++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 36 deletions(-) delete mode 100644 indra/cmake/LLConvexDecomposition.cmake delete mode 100644 indra/cmake/LLPathingLib.cmake create mode 100644 indra/cmake/LLPhysicsExtensions.cmake (limited to 'indra/cmake') diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 279d577a27..7fccf3327f 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -42,7 +42,6 @@ set(cmake_SOURCE_FILES LLAudio.cmake LLCharacter.cmake LLCommon.cmake - LLConvexDecomposition.cmake LLCrashLogger.cmake LLDatabase.cmake LLImage.cmake @@ -53,6 +52,7 @@ set(cmake_SOURCE_FILES LLMessage.cmake LLPlugin.cmake LLPrimitive.cmake + LLPhysicsExtensions.cmake LLRender.cmake LLScene.cmake LLTestCommand.cmake diff --git a/indra/cmake/LLConvexDecomposition.cmake b/indra/cmake/LLConvexDecomposition.cmake deleted file mode 100644 index 1731853300..0000000000 --- a/indra/cmake/LLConvexDecomposition.cmake +++ /dev/null @@ -1,12 +0,0 @@ -# -*- cmake -*- -include(Prebuilt) - -set(LLCONVEXDECOMP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) - -# if (INSTALL_PROPRIETARY AND NOT STANDALONE) -# use_prebuilt_binary(llconvexdecomposition) -# set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition) -# else (INSTALL_PROPRIETARY AND NOT STANDALONE) - use_prebuilt_binary(llconvexdecompositionstub) - set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) -# endif (INSTALL_PROPRIETARY AND NOT STANDALONE) diff --git a/indra/cmake/LLPathingLib.cmake b/indra/cmake/LLPathingLib.cmake deleted file mode 100644 index 8e622d83db..0000000000 --- a/indra/cmake/LLPathingLib.cmake +++ /dev/null @@ -1,23 +0,0 @@ -# -*- cmake -*- -include(Prebuilt) - -use_prebuilt_binary(llpathinglib) -set(LLPATHING_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/libraries/include) - - -set(LLPATHING_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) -set(LLPATHING_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) - -find_library(LL_PATHING_DEBUG_LIB llpathinglib PATHS ${LLPATHING_DEBUG_LIBRARY_PATH}) -find_library(LL_PATHING_RELEASE_LIB llpathinglib PATHS ${LLPATHING_RELEASE_LIBRARY_PATH}) - -set(LLPATHING_LIBRARIES - - debug ${LL_PATHING_DEBUG_LIB} - optimized ${LL_PATHING_RELEASE_LIB} -) - -if (LINUX) - list(INSERT LLPATHING_LIBRARIES 0 -Wl,--start-group) - list(APPEND LLPATHING_LIBRARIES -Wl,--end-group) -endif (LINUX) diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake new file mode 100644 index 0000000000..252be44d30 --- /dev/null +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -0,0 +1,31 @@ +# -*- cmake -*- +include(Prebuilt) + +use_prebuilt_binary(llpysicsextensions) +set(LLPHYSICS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/lib/include) + +set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) +set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) + +find_library(LL_PHYSICS_DEBUG_LIB llpathinglib PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH}) +find_library(LL_PHYSICS_RELEASE_LIB llpathinglib PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH}) + +set(LLPHYSICS_LIBRARIES + + debug ${LL_PHYSICS_DEBUG_LIB} + optimized ${LL_PHYSICS_RELEASE_LIB} +) + +if (LINUX) + list(INSERT LLPHYSICS_LIBRARIES 0 -Wl,--start-group) + list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group) +endif (LINUX) + +# if (INSTALL_PROPRIETARY AND NOT STANDALONE) +# use_prebuilt_binary(llconvexdecomposition) +# set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition) +# else (INSTALL_PROPRIETARY AND NOT STANDALONE) +# use_prebuilt_binary(llconvexdecompositionstub) +# set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) +# endif (INSTALL_PROPRIETARY AND NOT STANDALONE) + -- cgit v1.2.3 From e67cc17e437141301cedca5ae194a3845d8f265b Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Wed, 25 Jan 2012 19:05:37 -0500 Subject: PATH-192 WIP adjusting cmake build for physics extensions --- indra/cmake/LLPhysicsExtensions.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index 252be44d30..598ac72849 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -1,14 +1,14 @@ # -*- cmake -*- include(Prebuilt) -use_prebuilt_binary(llpysicsextensions) +use_prebuilt_binary(llphysicsextensions) set(LLPHYSICS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/lib/include) set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) -find_library(LL_PHYSICS_DEBUG_LIB llpathinglib PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH}) -find_library(LL_PHYSICS_RELEASE_LIB llpathinglib PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH}) +find_library(LL_PHYSICS_DEBUG_LIB llphysicsextensions PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH}) +find_library(LL_PHYSICS_RELEASE_LIB llphysicsextensions PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH}) set(LLPHYSICS_LIBRARIES -- cgit v1.2.3 From 16b6595fa75047c6c53ee11a6c3004e99ae0937d Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 26 Jan 2012 13:38:11 -0500 Subject: trying to fix linux build error --- indra/cmake/Copy3rdPartyLibs.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 8e5d901779..966300f1c7 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -268,13 +268,16 @@ elseif(LINUX) libopenal.so libopenjpeg.so libssl.so - libtcmalloc_minimal.so libuuid.so.16 libuuid.so.16.0.22 libssl.so.1.0.0 libfontconfig.so.1.4.4 ) + if (USE_TCMALLOC) + set(release_files ${release_files} "libtcmalloc_minimal.so") + endif (USE_TCMALLOC) + if (FMOD) set(release_files ${release_files} "libfmod-3.75.so") endif (FMOD) -- cgit v1.2.3 From 1c14b084569d6482d25d6ea2c29dae716cd1d7f7 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Thu, 26 Jan 2012 14:06:57 -0800 Subject: PATH-181 and PATH-194: Starting to put back the ability to build the viewer using the stub libraries. --- indra/cmake/LLPhysicsExtensions.cmake | 38 +++++++++++++++-------------------- 1 file changed, 16 insertions(+), 22 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index 598ac72849..81493dfdff 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -1,31 +1,25 @@ # -*- cmake -*- include(Prebuilt) -use_prebuilt_binary(llphysicsextensions) set(LLPHYSICS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/lib/include) -set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) -set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) +if (INSTALL_PROPRIETARY AND NOT STANDALONE) + use_prebuilt_binary(llphysicsextensions) -find_library(LL_PHYSICS_DEBUG_LIB llphysicsextensions PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH}) -find_library(LL_PHYSICS_RELEASE_LIB llphysicsextensions PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH}) + set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) + set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) -set(LLPHYSICS_LIBRARIES + find_library(LL_PHYSICS_DEBUG_LIB llphysicsextensions PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH}) + find_library(LL_PHYSICS_RELEASE_LIB llphysicsextensions PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH}) - debug ${LL_PHYSICS_DEBUG_LIB} - optimized ${LL_PHYSICS_RELEASE_LIB} -) - -if (LINUX) - list(INSERT LLPHYSICS_LIBRARIES 0 -Wl,--start-group) - list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group) -endif (LINUX) - -# if (INSTALL_PROPRIETARY AND NOT STANDALONE) -# use_prebuilt_binary(llconvexdecomposition) -# set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition) -# else (INSTALL_PROPRIETARY AND NOT STANDALONE) -# use_prebuilt_binary(llconvexdecompositionstub) -# set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) -# endif (INSTALL_PROPRIETARY AND NOT STANDALONE) + set(LLPHYSICS_LIBRARIES + debug ${LL_PHYSICS_DEBUG_LIB} + optimized ${LL_PHYSICS_RELEASE_LIB} + ) + if (LINUX) + list(INSERT LLPHYSICS_LIBRARIES 0 -Wl,--start-group) + list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group) + endif (LINUX) +else (INSTALL_PROPRIETARY AND NOT STANDALONE) +endif (INSTALL_PROPRIETARY AND NOT STANDALONE) -- cgit v1.2.3 From 00c85944548f7236a0951d4711b33b660b17588b Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Thu, 26 Jan 2012 15:24:25 -0800 Subject: PATH-181 and PATH-194: Implementing the building of the viewer with the stub library and validating that it does load/run as expected with the physics extensions disabled. --- indra/cmake/LLPhysicsExtensions.cmake | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index 81493dfdff..0ab57e48db 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -1,25 +1,27 @@ # -*- cmake -*- include(Prebuilt) +use_prebuilt_binary(llphysicsextensions) set(LLPHYSICS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/lib/include) -if (INSTALL_PROPRIETARY AND NOT STANDALONE) - use_prebuilt_binary(llphysicsextensions) +set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) +set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) - set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) - set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) +if (INSTALL_PROPRIETARY AND NOT STANDALONE) + set(LL_PHYSICS_LIB_NAME "llphysicsextensions") +else (INSTALL_PROPRIETARY AND NOT STANDALONE) + set(LL_PHYSICS_LIB_NAME "llphysicsextensionsstub") +endif (INSTALL_PROPRIETARY AND NOT STANDALONE) - find_library(LL_PHYSICS_DEBUG_LIB llphysicsextensions PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH}) - find_library(LL_PHYSICS_RELEASE_LIB llphysicsextensions PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH}) +find_library(LL_PHYSICS_DEBUG_LIB ${LL_PHYSICS_LIB_NAME} PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH}) +find_library(LL_PHYSICS_RELEASE_LIB ${LL_PHYSICS_LIB_NAME} PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH}) - set(LLPHYSICS_LIBRARIES - debug ${LL_PHYSICS_DEBUG_LIB} - optimized ${LL_PHYSICS_RELEASE_LIB} - ) +set(LLPHYSICS_LIBRARIES + debug ${LL_PHYSICS_DEBUG_LIB} + optimized ${LL_PHYSICS_RELEASE_LIB} +) - if (LINUX) - list(INSERT LLPHYSICS_LIBRARIES 0 -Wl,--start-group) - list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group) - endif (LINUX) -else (INSTALL_PROPRIETARY AND NOT STANDALONE) -endif (INSTALL_PROPRIETARY AND NOT STANDALONE) +if (LINUX) + list(INSERT LLPHYSICS_LIBRARIES 0 -Wl,--start-group) + list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group) +endif (LINUX) -- cgit v1.2.3 From f19a77047d10eca2bff07891375b7859b9e68e99 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Fri, 27 Jan 2012 15:09:20 -0500 Subject: PATH-192 FIX fixed last issues with convex decomp merge --- indra/cmake/LLPhysicsExtensions.cmake | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index 598ac72849..53972e050a 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -1,14 +1,21 @@ # -*- cmake -*- include(Prebuilt) -use_prebuilt_binary(llphysicsextensions) +if (INSTALL_PROPRIETARY AND NOT STANDALONE) + use_prebuilt_binary(llphysicsextensions) + set(LLPHYSICS_EXTENSIONS_LIB_NAME llphysicsextensions) +else (INSTALL_PROPRIETARY AND NOT STANDALONE) + use_prebuilt_binary(llphysicsextensionsstub) + set(LLPHYSICS_EXTENSIONS_LIB_NAME llphysicsextensionsstub) +endif (INSTALL_PROPRIETARY AND NOT STANDALONE) + set(LLPHYSICS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/lib/include) set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) -find_library(LL_PHYSICS_DEBUG_LIB llphysicsextensions PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH}) -find_library(LL_PHYSICS_RELEASE_LIB llphysicsextensions PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH}) +find_library(LL_PHYSICS_DEBUG_LIB ${LLPHYSICS_EXTENSIONS_LIB_NAME} PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH}) +find_library(LL_PHYSICS_RELEASE_LIB ${LLPHYSICS_EXTENSIONS_LIB_NAME} PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH}) set(LLPHYSICS_LIBRARIES @@ -21,11 +28,3 @@ if (LINUX) list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group) endif (LINUX) -# if (INSTALL_PROPRIETARY AND NOT STANDALONE) -# use_prebuilt_binary(llconvexdecomposition) -# set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition) -# else (INSTALL_PROPRIETARY AND NOT STANDALONE) -# use_prebuilt_binary(llconvexdecompositionstub) -# set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) -# endif (INSTALL_PROPRIETARY AND NOT STANDALONE) - -- cgit v1.2.3 From b13fe12fb950f714a2e2fd97708a3baef39ef285 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 3 Feb 2012 14:10:51 -0500 Subject: tcmalloc on by default --- indra/cmake/GooglePerfTools.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 73b3642ae6..09501e0406 100755 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -3,7 +3,7 @@ include(Prebuilt) # If you want to enable or disable TCMALLOC in viewer builds, this is the place. # set ON or OFF as desired. -set (USE_TCMALLOC OFF) +set (USE_TCMALLOC ON) if (STANDALONE) include(FindGooglePerfTools) -- cgit v1.2.3 From 6d050cad618493b7881ea6d0073e64ba732b6352 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Fri, 10 Feb 2012 16:25:55 +0100 Subject: - fixed : Hunspell linking issues --- indra/cmake/CMakeLists.txt | 1 + indra/cmake/FindHUNSPELL.cmake | 38 ++++++++++++++++++++++++++++++++++++++ indra/cmake/Hunspell.cmake | 21 +++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 indra/cmake/FindHUNSPELL.cmake create mode 100644 indra/cmake/Hunspell.cmake (limited to 'indra/cmake') diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 279d577a27..9b836aac5f 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -37,6 +37,7 @@ set(cmake_SOURCE_FILES GLOD.cmake GStreamer010Plugin.cmake GooglePerfTools.cmake + Hunspell.cmake JPEG.cmake LLAddBuildTest.cmake LLAudio.cmake diff --git a/indra/cmake/FindHUNSPELL.cmake b/indra/cmake/FindHUNSPELL.cmake new file mode 100644 index 0000000000..d411bdb9e5 --- /dev/null +++ b/indra/cmake/FindHUNSPELL.cmake @@ -0,0 +1,38 @@ +# -*- cmake -*- + +# - Find HUNSPELL +# This module defines +# HUNSPELL_INCLUDE_DIR, where to find libhunspell.h, etc. +# HUNSPELL_LIBRARY, the library needed to use HUNSPELL. +# HUNSPELL_FOUND, If false, do not try to use HUNSPELL. + +find_path(HUNSPELL_INCLUDE_DIR hunspell.h + PATH_SUFFIXES hunspell + ) + +set(HUNSPELL_NAMES ${HUNSPELL_NAMES} libhunspell-1.3 libhunspell) +find_library(HUNSPELL_LIBRARY + NAMES ${HUNSPELL_NAMES} + ) + +if (HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR) + set(HUNSPELL_FOUND "YES") +else (HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR) + set(HUNSPELL_FOUND "NO") +endif (HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR) + + +if (HUNSPELL_FOUND) + if (NOT HUNSPELL_FIND_QUIETLY) + message(STATUS "Found Hunspell: Library in '${HUNSPELL_LIBRARY}' and header in '${HUNSPELL_INCLUDE_DIR}' ") + endif (NOT HUNSPELL_FIND_QUIETLY) +else (HUNSPELL_FOUND) + if (HUNSPELL_FIND_REQUIRED) + message(FATAL_ERROR " * * *\nCould not find HUNSPELL library! * * *") + endif (HUNSPELL_FIND_REQUIRED) +endif (HUNSPELL_FOUND) + +mark_as_advanced( + HUNSPELL_LIBRARY + HUNSPELL_INCLUDE_DIR + ) diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake new file mode 100644 index 0000000000..def2198c93 --- /dev/null +++ b/indra/cmake/Hunspell.cmake @@ -0,0 +1,21 @@ +# -*- cmake -*- +include(Prebuilt) + +set(HUNSPELL_FIND_QUIETLY ON) +set(HUNSPELL_FIND_REQUIRED ON) + +if (STANDALONE) + include(FindHUNSPELL) +else (STANDALONE) + use_prebuilt_binary(libhunspell) + if (WINDOWS) + set(HUNSPELL_LIBRARY libhunspell) + set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell) + elseif(DARWIN) + set(HUNSPELL_LIBRARY hunspell-1.3) + set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell) + else() + set(HUNSPELL_LIBRARY hunspell-1.3) + set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell) + endif() +endif (STANDALONE) -- cgit v1.2.3 From e02bf8f90dba7cd7ac8874d7ee1baf782397784f Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 23 Apr 2012 14:00:25 -0400 Subject: add dictionaries to the Hunspell.cmake so that it gets installed --- indra/cmake/Hunspell.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/cmake') diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake index def2198c93..24cf41f4e4 100644 --- a/indra/cmake/Hunspell.cmake +++ b/indra/cmake/Hunspell.cmake @@ -8,6 +8,7 @@ if (STANDALONE) include(FindHUNSPELL) else (STANDALONE) use_prebuilt_binary(libhunspell) + use_prebuilt_binary(dictionaries) if (WINDOWS) set(HUNSPELL_LIBRARY libhunspell) set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell) -- cgit v1.2.3 From 7bcfd3a4ae824d973802b1431a13e91eee18c89a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 23 Apr 2012 17:27:54 -0400 Subject: fix version number of the libhunspell dylib in another place --- indra/cmake/Copy3rdPartyLibs.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index ebeae3e5be..6765d36ba3 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -217,7 +217,7 @@ elseif(DARWIN) libllqtwebkit.dylib libminizip.a libndofdev.dylib - libhunspell-1.3.dylib + libhunspell-1.3.0.dylib libexception_handler.dylib libcollada14dom.dylib ) -- cgit v1.2.3 From 9b64464d02918307048be6fe5f0b784010d38bf8 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 25 Apr 2012 12:27:34 -0400 Subject: more attempts to fix the hunspell lib for Mac --- indra/cmake/Copy3rdPartyLibs.cmake | 11 ++++++----- indra/cmake/FindHUNSPELL.cmake | 2 +- indra/cmake/Hunspell.cmake | 10 +++++----- 3 files changed, 12 insertions(+), 11 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 6765d36ba3..224e0a8b51 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -214,12 +214,12 @@ elseif(DARWIN) libexpat.1.5.2.dylib libexpat.dylib libGLOD.dylib - libllqtwebkit.dylib - libminizip.a + libllqtwebkit.dylib + libminizip.a libndofdev.dylib libhunspell-1.3.0.dylib libexception_handler.dylib - libcollada14dom.dylib + libcollada14dom.dylib ) # fmod is statically linked on darwin @@ -260,14 +260,15 @@ elseif(LINUX) libdb-5.1.so libexpat.so libexpat.so.1 - libglod.so + libglod.so libgmock_main.so libgmock.so.0 libgmodule-2.0.so libgobject-2.0.so libgtest_main.so libgtest.so.0 - libminizip.so + libhunspell-1.3.so.0.0.0 + libminizip.so libopenal.so libopenjpeg.so libssl.so diff --git a/indra/cmake/FindHUNSPELL.cmake b/indra/cmake/FindHUNSPELL.cmake index d411bdb9e5..6faf22959c 100644 --- a/indra/cmake/FindHUNSPELL.cmake +++ b/indra/cmake/FindHUNSPELL.cmake @@ -10,7 +10,7 @@ find_path(HUNSPELL_INCLUDE_DIR hunspell.h PATH_SUFFIXES hunspell ) -set(HUNSPELL_NAMES ${HUNSPELL_NAMES} libhunspell-1.3 libhunspell) +set(HUNSPELL_NAMES ${HUNSPELL_NAMES} libhunspell-1.3.0 libhunspell) find_library(HUNSPELL_LIBRARY NAMES ${HUNSPELL_NAMES} ) diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake index 24cf41f4e4..0c9cf93316 100644 --- a/indra/cmake/Hunspell.cmake +++ b/indra/cmake/Hunspell.cmake @@ -8,15 +8,15 @@ if (STANDALONE) include(FindHUNSPELL) else (STANDALONE) use_prebuilt_binary(libhunspell) - use_prebuilt_binary(dictionaries) if (WINDOWS) set(HUNSPELL_LIBRARY libhunspell) - set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell) elseif(DARWIN) + set(HUNSPELL_LIBRARY hunspell-1.3.0) + elseif(LINUX) set(HUNSPELL_LIBRARY hunspell-1.3) - set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell) else() - set(HUNSPELL_LIBRARY hunspell-1.3) - set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell) + message(FATAL_ERROR "Invalid platform") endif() + set(HUNSPELL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/hunspell) + use_prebuilt_binary(dictionaries) endif (STANDALONE) -- cgit v1.2.3 From ad745867ed820c39718de9519b15f25a5526ae37 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Fri, 8 Jun 2012 14:19:36 -0500 Subject: MAINT-646 Enable /fp:fast in Visual Studio --- indra/cmake/00-Common.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 98eeed09b3..00baf626d2 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -69,6 +69,7 @@ if (WINDOWS) /Oy- /Zc:wchar_t- /arch:SSE2 + /fp:fast ) # Are we using the crummy Visual Studio KDU build workaround? -- cgit v1.2.3 From 619e0b9a359a0dd340bcb734ff6397b8af976258 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 3 Jul 2012 09:36:38 -0400 Subject: remove some cmake output that is no longer needed --- indra/cmake/Linking.cmake | 3 +-- indra/cmake/ViewerMiscLibs.cmake | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake index 47f944f9a5..c3e3a80fd0 100644 --- a/indra/cmake/Linking.cmake +++ b/indra/cmake/Linking.cmake @@ -38,9 +38,8 @@ if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") # packages/lib/release directory to deal with autobuild packages that don't # provide (e.g.) lib/debug libraries. list(APPEND AUTOBUILD_LIBS_INSTALL_DIRS ${ARCH_PREBUILT_DIRS_RELEASE}) - message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}, extending AUTOBUILD_LIBS_INSTALL_DIRS") endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release") -message(STATUS "For ${CMAKE_BUILD_TYPE}, AUTOBUILD_LIBS_INSTALL_DIRS: ${AUTOBUILD_LIBS_INSTALL_DIRS}") + link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS}) if (LINUX) diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index df013b1665..cec7c28733 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -7,10 +7,3 @@ if (NOT STANDALONE) use_prebuilt_binary(fontconfig) endif(NOT STANDALONE) -if(VIEWER AND NOT STANDALONE) - if(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker) - message(STATUS "We seem to have an artwork bundle in the tree - brilliant.") - else(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker) - message(FATAL_ERROR "Didn't find an artwork bundle - this needs to be downloaded separately and unpacked into this tree. You can probably get it from the same place you got your viewer source. Thanks!") - endif(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker) -endif(VIEWER AND NOT STANDALONE) -- cgit v1.2.3 From 14f754f1608a0f8ca62ead485669d88cc651667d Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 5 Jul 2012 06:08:34 -0400 Subject: begin integrating building of llphysicsextensions from source here (incomplete) --- indra/cmake/Havok.cmake | 67 +++++++++++++++++++++++++++++++++++ indra/cmake/LLPhysicsExtensions.cmake | 38 ++++++++++---------- 2 files changed, 85 insertions(+), 20 deletions(-) create mode 100644 indra/cmake/Havok.cmake (limited to 'indra/cmake') diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake new file mode 100644 index 0000000000..d3df85fd39 --- /dev/null +++ b/indra/cmake/Havok.cmake @@ -0,0 +1,67 @@ +# -*- cmake -*- + +use_prebuilt_binary(havok-source) +set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Source) +list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo) + +set(HAVOK_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok) +set(HAVOK_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release/havok) + +set(HAVOK_LIBS + hkBase + hkCompat + hkGeometryUtilities + hkInternal + hkSerialize + hkSceneData + hkpCollide + hkpUtilities + hkpConstraintSolver + hkpDynamics + hkpInternal + hkaiInternal + hkaiPathfinding + hkaiAiPhysicsBridge + hkcdInternal + hkcdCollide + hkpVehicle + hkVisualize + hkaiVisualize + hkgpConvexDecomposition +) + +unset(HK_DEBUG_LIBRARIES) +unset(HK_RELEASE_LIBRARIES) +unset(HK_LIBRARIES) + +foreach(HAVOK_LIB ${HAVOK_LIBS}) + find_library(HAVOK_DEBUG_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) + find_library(HAVOK_RELEASE_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) + + if(LINUX) + set(cmd "mkdir") + set(debug_dir "${HAVOK_DEBUG_LIBRARY_PATH}/${HAVOK_LIB}") + set(release_dir "${HAVOK_RELEASE_LIBRARY_PATH}/${HAVOK_LIB}") + exec_program( ${cmd} ${HAVOK_DEBUG_LIBRARY_PATH} ARGS ${debug_dir} OUTPUT_VARIABLE rv) + exec_program( ${cmd} ${HAVOK_RELEASE_LIBRARY_PATH} ARGS ${release_dir} OUTPUT_VARIABLE rv) + + set(cmd "ar") + set(arg " -xv") + set(arg "${arg} ../lib${HAVOK_LIB}.a") + exec_program( ${cmd} ${debug_dir} ARGS ${arg} OUTPUT_VARIABLE rv) + exec_program( ${cmd} ${release_dir} ARGS ${arg} OUTPUT_VARIABLE rv) + + file(GLOB extracted_debug "${debug_dir}/*.o") + file(GLOB extracted_release "${release_dir}/*.o") + list(APPEND HK_DEBUG_LIBRARIES ${extracted_debug}) + list(APPEND HK_RELEASE_LIBRARIES ${extracted_release}) + list(APPEND HK_LIBRARIES debug ${extracted_debug} + optimized ${extracted_release}) + else(LINUX) + list(APPEND HK_DEBUG_LIBRARIES ${HAVOK_DEBUG_LIB_${HAVOK_LIB}}) + list(APPEND HK_RELEASE_LIBRARIES ${HAVOK_RELEASE_LIB_${HAVOK_LIB}}) + list(APPEND HK_LIBRARIES debug ${HAVOK_DEBUG_LIB_${HAVOK_LIB}} + optimized ${HAVOK_RELEASE_LIB_${HAVOK_LIB}}) + endif (LINUX) +endforeach(HAVOK_LIB) + diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index 73d5dd59cf..c9812d06d6 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -1,29 +1,27 @@ # -*- cmake -*- include(Prebuilt) -if (INSTALL_PROPRIETARY AND NOT STANDALONE) - use_prebuilt_binary(llphysicsextensions) - set(LLPHYSICS_EXTENSIONS_LIB_NAME llphysicsextensions) -else (INSTALL_PROPRIETARY AND NOT STANDALONE) - use_prebuilt_binary(llphysicsextensionsstub) - set(LLPHYSICS_EXTENSIONS_LIB_NAME llphysicsextensionsstub) -endif (INSTALL_PROPRIETARY AND NOT STANDALONE) +# Note that the use_prebuilt_binary macros below do not in fact include binaries; +# the llphysicsextensions_* packages are source only and are built here. +# The source package and the stub package both build libraries of the same name. -set(LLPHYSICS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/lib/include) +# Using the real wrapper or the stub can be controlled with -DHAVOK:BOOL={ON,OFF} +# the default +if (INSTALL_PROPRIETARY) + set(HAVOK ON CACHE BOOL "Use Havok physics library") +endif (INSTALL_PROPRIETARY) -set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug) -set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release) +if (HAVOK) + include(Havok) + use_prebuilt_binary(llphysicsextensions_source) + set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src) -find_library(LL_PHYSICS_DEBUG_LIB ${LLPHYSICS_EXTENSIONS_LIB_NAME} PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH}) -find_library(LL_PHYSICS_RELEASE_LIB ${LLPHYSICS_EXTENSIONS_LIB_NAME} PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH}) +else (HAVOK) + use_prebuilt_binary(llphysicsextensions_stub) + set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub) -set(LLPHYSICS_LIBRARIES +endif (HAVOK) - debug ${LL_PHYSICS_DEBUG_LIB} - optimized ${LL_PHYSICS_RELEASE_LIB} -) +set(LLPHYSICSEXTENSIONS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/llphysicsextensions) -if (LINUX) - list(INSERT LLPHYSICS_LIBRARIES 0 -Wl,--start-group) - list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group) -endif (LINUX) +add_subdirectory(${LLPHYSICSEXTENSIONS_SRC_DIR} llphysicsextensions) -- cgit v1.2.3 From 21ee5f8d415920827a477ae236f30e7d09dc8e9f Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 5 Jul 2012 09:39:21 -0400 Subject: successful build with llphysicsextensions stub --- indra/cmake/LLPhysicsExtensions.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/cmake') diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index c9812d06d6..224d7f9b45 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -15,10 +15,12 @@ if (HAVOK) include(Havok) use_prebuilt_binary(llphysicsextensions_source) set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src) + set(LLPHYSICSEXTENSIONS_LIBRARIES llphysicsextensions) else (HAVOK) use_prebuilt_binary(llphysicsextensions_stub) set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub) + set(LLPHYSICSEXTENSIONS_LIBRARIES llphysicsextensionsstub) endif (HAVOK) -- cgit v1.2.3 From 702e6815ed70cb210dc2a014237e0c15a2a69045 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 5 Jul 2012 12:16:48 -0400 Subject: partial changes for building with the llphysicsextensions source package --- indra/cmake/LLPhysicsExtensions.cmake | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index 224d7f9b45..72ac35e02b 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -25,5 +25,3 @@ else (HAVOK) endif (HAVOK) set(LLPHYSICSEXTENSIONS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/llphysicsextensions) - -add_subdirectory(${LLPHYSICSEXTENSIONS_SRC_DIR} llphysicsextensions) -- cgit v1.2.3 From 82f3ee0b3c4b518fbc1b5bb592bbd6101828ca10 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 10 Jul 2012 09:40:01 -0400 Subject: experimental - try 10.6 SDK and lvmgcc42 on TeamCity --- indra/cmake/Variables.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 4cbf7aa043..56ced20abf 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -101,8 +101,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # To support a different SDK update these Xcode settings: set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) - set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.0") + set(CMAKE_OSX_SYSROOT macosx10.6) + set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym) # NOTE: To attempt an i386/PPC Universal build, add this on the configure line: -- cgit v1.2.3 From e80c001e31c8e5822f793428cd65f5d732dbcd19 Mon Sep 17 00:00:00 2001 From: "Matthew Breindel (Falcon)" Date: Tue, 10 Jul 2012 18:16:05 -0700 Subject: Updating Havok.cmake to support all 3 major build configurations on all platforms. This is incomplete and requires additional changes to the 3p-havok-source repo and the llphysicsextensions-src repo. --- indra/cmake/Havok.cmake | 71 ++++++++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 28 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake index d3df85fd39..7e65efda68 100644 --- a/indra/cmake/Havok.cmake +++ b/indra/cmake/Havok.cmake @@ -4,8 +4,18 @@ use_prebuilt_binary(havok-source) set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Source) list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo) -set(HAVOK_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok) +set(HAVOK_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug) set(HAVOK_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release/havok) +if (LL_DEBUG_HAVOK) + if (WIN32) + set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-hybrid) + else (WIN32) + set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug) + endif(WIN32) +else (LL_DEBUG_HAVOK) + set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok) +endif (LL_DEBUG_HAVOK) + set(HAVOK_LIBS hkBase @@ -32,36 +42,41 @@ set(HAVOK_LIBS unset(HK_DEBUG_LIBRARIES) unset(HK_RELEASE_LIBRARIES) -unset(HK_LIBRARIES) +unset(HK_RELWITHDEBINFO_LIBRARIES) foreach(HAVOK_LIB ${HAVOK_LIBS}) - find_library(HAVOK_DEBUG_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) - find_library(HAVOK_RELEASE_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) - - if(LINUX) - set(cmd "mkdir") - set(debug_dir "${HAVOK_DEBUG_LIBRARY_PATH}/${HAVOK_LIB}") - set(release_dir "${HAVOK_RELEASE_LIBRARY_PATH}/${HAVOK_LIB}") - exec_program( ${cmd} ${HAVOK_DEBUG_LIBRARY_PATH} ARGS ${debug_dir} OUTPUT_VARIABLE rv) - exec_program( ${cmd} ${HAVOK_RELEASE_LIBRARY_PATH} ARGS ${release_dir} OUTPUT_VARIABLE rv) + find_library(HAVOK_DEBUG_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) + find_library(HAVOK_RELEASE_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) + find_library(HAVOK_RELWITHDEBINFO_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_RELWITHDEBINFO_LIBRARY_PATH}) + + if(LINUX) + set(cmd "mkdir") + set(debug_dir "${HAVOK_DEBUG_LIBRARY_PATH}/${HAVOK_LIB}") + set(release_dir "${HAVOK_RELEASE_LIBRARY_PATH}/${HAVOK_LIB}") + set(relwithdebinfo_dir "${HAVOK_RELWITHDEBINFO_LIBRARY_PATH}/${HAVOK_LIB}") + + exec_program( ${cmd} ${HAVOK_DEBUG_LIBRARY_PATH} ARGS ${debug_dir} OUTPUT_VARIABLE rv) + exec_program( ${cmd} ${HAVOK_RELEASE_LIBRARY_PATH} ARGS ${release_dir} OUTPUT_VARIABLE rv) + exec_program( ${cmd} ${HAVOK_RELWITHDEBINFO_LIBRARY_PATH} ARGS ${relwithdebinfo_dir} OUTPUT_VARIABLE rv) - set(cmd "ar") - set(arg " -xv") - set(arg "${arg} ../lib${HAVOK_LIB}.a") - exec_program( ${cmd} ${debug_dir} ARGS ${arg} OUTPUT_VARIABLE rv) - exec_program( ${cmd} ${release_dir} ARGS ${arg} OUTPUT_VARIABLE rv) + set(cmd "ar") + set(arg " -xv") + set(arg "${arg} ../lib${HAVOK_LIB}.a") + exec_program( ${cmd} ${debug_dir} ARGS ${arg} OUTPUT_VARIABLE rv) + exec_program( ${cmd} ${release_dir} ARGS ${arg} OUTPUT_VARIABLE rv) + exec_program( ${cmd} ${relwithdebinfo_dir} ARGS ${arg} OUTPUT_VARIABLE rv) - file(GLOB extracted_debug "${debug_dir}/*.o") - file(GLOB extracted_release "${release_dir}/*.o") - list(APPEND HK_DEBUG_LIBRARIES ${extracted_debug}) - list(APPEND HK_RELEASE_LIBRARIES ${extracted_release}) - list(APPEND HK_LIBRARIES debug ${extracted_debug} - optimized ${extracted_release}) - else(LINUX) - list(APPEND HK_DEBUG_LIBRARIES ${HAVOK_DEBUG_LIB_${HAVOK_LIB}}) - list(APPEND HK_RELEASE_LIBRARIES ${HAVOK_RELEASE_LIB_${HAVOK_LIB}}) - list(APPEND HK_LIBRARIES debug ${HAVOK_DEBUG_LIB_${HAVOK_LIB}} - optimized ${HAVOK_RELEASE_LIB_${HAVOK_LIB}}) - endif (LINUX) + file(GLOB extracted_debug "${debug_dir}/*.o") + file(GLOB extracted_release "${release_dir}/*.o") + file(GLOB extracted_relwithdebinfo "${release_dir}/*.o") + list(APPEND HK_DEBUG_LIBRARIES ${extracted_debug}) + list(APPEND HK_RELEASE_LIBRARIES ${extracted_release}) + list(APPEND HK_RELWITHDEBINFO_LIBRARIES ${extracted_relwithdebinfo}) + else(LINUX) + # Win32 + list(APPEND HK_DEBUG_LIBRARIES ${HAVOK_DEBUG_LIB_${HAVOK_LIB}}) + list(APPEND HK_RELEASE_LIBRARIES ${HAVOK_RELEASE_LIB_${HAVOK_LIB}}) + list(APPEND HK_RELWITHDEBINFO_LIBRARIES ${HAVOK_RELWITHDEBINFO_LIB_${HAVOK_LIB}}) + endif (LINUX) endforeach(HAVOK_LIB) -- cgit v1.2.3 From 847a2738a30d8201210f0a802f72131243e04259 Mon Sep 17 00:00:00 2001 From: "Matthew Breindel (Falcon)" Date: Wed, 11 Jul 2012 14:55:01 -0700 Subject: Changed windows to always use havok Hybrid in RelWithDebInfo. Windows no longer uses Havok Debug. On other platforms, use of Debug vs Fulldebug in RelWithDebInfo is still governed by LL_DEBUG_HAVOK --- indra/cmake/Havok.cmake | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake index 3d63459f02..49b348e9f7 100644 --- a/indra/cmake/Havok.cmake +++ b/indra/cmake/Havok.cmake @@ -6,15 +6,13 @@ list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo) set(HAVOK_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug) set(HAVOK_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release/havok) -if (LL_DEBUG_HAVOK) - if (WIN32) - set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-hybrid) - else (WIN32) - set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug) - endif(WIN32) -else (LL_DEBUG_HAVOK) - set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok) -endif (LL_DEBUG_HAVOK) + +if (LL_DEBUG_HAVOK AND NOT WIN32) + set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug) +else (LL_DEBUG_HAVOK AND NOT WIN32) + # Always link relwithdebinfo to havok-hybrid on windows. + set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-hybrid) +endif (LL_DEBUG_HAVOK AND NOT WIN32) set(HAVOK_LIBS -- cgit v1.2.3 From 12b1ec62645e772174cd710a208f59ab823eafe0 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 20 Jul 2012 07:38:12 -0700 Subject: refactor to build llphysicsextensions_tpv package for sublicensees --- indra/cmake/LLPhysicsExtensions.cmake | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake index 72ac35e02b..e6afee762e 100644 --- a/indra/cmake/LLPhysicsExtensions.cmake +++ b/indra/cmake/LLPhysicsExtensions.cmake @@ -1,22 +1,30 @@ # -*- cmake -*- include(Prebuilt) -# Note that the use_prebuilt_binary macros below do not in fact include binaries; -# the llphysicsextensions_* packages are source only and are built here. -# The source package and the stub package both build libraries of the same name. +# There are three possible solutions to provide the llphysicsextensions: +# - The full source package, selected by -DHAVOK:BOOL=ON +# - The stub source package, selected by -DHAVOK:BOOL=OFF +# - The prebuilt package available to those with sublicenses, selected by -DHAVOK_TPV:BOOL=ON -# Using the real wrapper or the stub can be controlled with -DHAVOK:BOOL={ON,OFF} -# the default if (INSTALL_PROPRIETARY) set(HAVOK ON CACHE BOOL "Use Havok physics library") endif (INSTALL_PROPRIETARY) + +# Note that the use_prebuilt_binary macros below do not in fact include binaries; +# the llphysicsextensions_* packages are source only and are built here. +# The source package and the stub package both build libraries of the same name. + if (HAVOK) include(Havok) use_prebuilt_binary(llphysicsextensions_source) set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src) set(LLPHYSICSEXTENSIONS_LIBRARIES llphysicsextensions) +elseif (HAVOK_TPV) + use_prebuilt_binary(llphysicsextensions_tpv) + set(LLPHYSICSEXTENSIONS_LIBRARIES llphysicsextensions_tpv) + else (HAVOK) use_prebuilt_binary(llphysicsextensions_stub) set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub) -- cgit v1.2.3 From 42cc602732824df9af239de3b5d7ba05b5797106 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sat, 21 Jul 2012 08:47:36 -0700 Subject: fix finding havok libs in relwithdebinfo mode (uses release unless LL_DEBUG_HAVOK is used --- indra/cmake/Havok.cmake | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake index 49b348e9f7..5c0768abfa 100644 --- a/indra/cmake/Havok.cmake +++ b/indra/cmake/Havok.cmake @@ -7,13 +7,16 @@ list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo) set(HAVOK_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug) set(HAVOK_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release/havok) -if (LL_DEBUG_HAVOK AND NOT WIN32) - set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug) -else (LL_DEBUG_HAVOK AND NOT WIN32) - # Always link relwithdebinfo to havok-hybrid on windows. - set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-hybrid) -endif (LL_DEBUG_HAVOK AND NOT WIN32) - +if (LL_DEBUG_HAVOK) + if (WIN32) + # Always link relwithdebinfo to havok-hybrid on windows. + set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-hybrid) + else (WIN32) + set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug) + endif (WIN32) +else (LL_DEBUG_HAVOK) + set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release/havok) +endif (LL_DEBUG_HAVOK) set(HAVOK_LIBS hkBase -- cgit v1.2.3