From 3e80fa3dbc943de9b784fedc202ba38cf238f46d Mon Sep 17 00:00:00 2001 From: David Parks Date: Mon, 2 Nov 2009 19:55:37 +0000 Subject: Sync up with render-pipeline-7 ignore-dead-branch --- indra/cmake/LLPrimitive.cmake | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'indra/cmake/LLPrimitive.cmake') diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index d397b78f1c..9f8d99a0bf 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -1,7 +1,27 @@ # -*- cmake -*- +# these should be moved to their own cmake file +include(Prebuilt) +use_prebuilt_binary(colladadom) +use_prebuilt_binary(pcre) +use_prebuilt_binary(libxml) + set(LLPRIMITIVE_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llprimitive ) -set(LLPRIMITIVE_LIBRARIES llprimitive) +if (WINDOWS) + set(LLPRIMITIVE_LIBRARIES + llprimitive + libcollada14dom21 + ) +else (WINDOWS) + set(LLPRIMITIVE_LIBRARIES + llprimitive + collada14dom + xml2 + pcrecpp + pcre + ) +endif (WINDOWS) + -- cgit v1.2.3 From c0d882fbff8b0bae584b25f57ebe614aeada6034 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 14 Oct 2010 11:26:59 -0500 Subject: Updated colladadom. --- indra/cmake/LLPrimitive.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/cmake/LLPrimitive.cmake') diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 9f8d99a0bf..fae1ef2a51 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -13,7 +13,12 @@ set(LLPRIMITIVE_INCLUDE_DIRS if (WINDOWS) set(LLPRIMITIVE_LIBRARIES llprimitive - libcollada14dom21 + debug libcollada14dom21-d + debug libboost_filesystem-d + debug libboost_system-d + optimized libcollada14dom21 + optimized libboost_filesystem + optimized libboost_system ) else (WINDOWS) set(LLPRIMITIVE_LIBRARIES -- cgit v1.2.3 From 4eec9dd54eb469157509048bc5ca9ac3693a8d18 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Fri, 29 Oct 2010 15:06:09 -0500 Subject: SH-262 Fix for debug build on windows. --- indra/cmake/LLPrimitive.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'indra/cmake/LLPrimitive.cmake') diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index fae1ef2a51..dd55bbfc50 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -11,13 +11,14 @@ set(LLPRIMITIVE_INCLUDE_DIRS ) if (WINDOWS) - set(LLPRIMITIVE_LIBRARIES - llprimitive + set(LLPRIMITIVE_LIBRARIES + debug llprimitive + optimized llprimtive debug libcollada14dom21-d - debug libboost_filesystem-d - debug libboost_system-d optimized libcollada14dom21 + debug libboost_filesystem-d optimized libboost_filesystem + debug libboost_system-d optimized libboost_system ) else (WINDOWS) -- cgit v1.2.3 From 8c950152eafc65bbf82b2ad3e0e4dd529e9f762d Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Fri, 29 Oct 2010 15:24:13 -0500 Subject: Fix for release build (misspelled llprimitive) --- indra/cmake/LLPrimitive.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake/LLPrimitive.cmake') diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index dd55bbfc50..4bdbfe46e2 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -13,7 +13,7 @@ set(LLPRIMITIVE_INCLUDE_DIRS if (WINDOWS) set(LLPRIMITIVE_LIBRARIES debug llprimitive - optimized llprimtive + optimized llprimitive debug libcollada14dom21-d optimized libcollada14dom21 debug libboost_filesystem-d -- cgit v1.2.3 From d490081fe29adabfd3a2dba81f5e65d90db3fb51 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 8 Apr 2011 17:12:26 -0400 Subject: changes for newer collada build --- indra/cmake/LLPrimitive.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 indra/cmake/LLPrimitive.cmake (limited to 'indra/cmake/LLPrimitive.cmake') diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake old mode 100644 new mode 100755 index 4bdbfe46e2..4d6a84b29e --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -14,8 +14,8 @@ if (WINDOWS) set(LLPRIMITIVE_LIBRARIES debug llprimitive optimized llprimitive - debug libcollada14dom21-d - optimized libcollada14dom21 + debug libcollada14dom22-d + optimized libcollada14dom22 debug libboost_filesystem-d optimized libboost_filesystem debug libboost_system-d -- cgit v1.2.3 From f92d521b46355caa17517b88cc9911179de3b221 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 14 Apr 2011 11:08:50 -0400 Subject: fixed windows boost library names --- indra/cmake/LLPrimitive.cmake | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'indra/cmake/LLPrimitive.cmake') diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 4d6a84b29e..b860a09de9 100755 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -9,17 +9,16 @@ use_prebuilt_binary(libxml) set(LLPRIMITIVE_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llprimitive ) - if (WINDOWS) set(LLPRIMITIVE_LIBRARIES debug llprimitive optimized llprimitive debug libcollada14dom22-d optimized libcollada14dom22 - debug libboost_filesystem-d - optimized libboost_filesystem - debug libboost_system-d - optimized libboost_system + debug libboost_filesystem-vc100-mt-gd-1_45 + optimized libboost_filesystem-vc100-mt-1_45 + debug libboost_system-vc100-mt-gd-1_45 + optimized libboost_system-vc100-mt-1_45 ) else (WINDOWS) set(LLPRIMITIVE_LIBRARIES -- cgit v1.2.3 From e9687600140761889c047530e0bc2ec3128e0ab7 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Mon, 18 Apr 2011 14:09:58 -0600 Subject: more fix for the libminizip issue for linux. --- indra/cmake/LLPrimitive.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/cmake/LLPrimitive.cmake') diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index b860a09de9..e68d16ed08 100755 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -24,6 +24,7 @@ else (WINDOWS) set(LLPRIMITIVE_LIBRARIES llprimitive collada14dom + minizip xml2 pcrecpp pcre -- cgit v1.2.3