From a7396b70bac706dbac8b31e216fd0e41dd17ae4b Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Fri, 21 Nov 2008 09:08:00 +0000
Subject: [PATCH] Fix segfault on linux. Merged from 2.0 branch.

---
 CMakeLists.txt            | 7 +++++++
 src/nvcore/CMakeLists.txt | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a97538..6ea8bad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,13 @@ MESSAGE(STATUS "Setting optimal options")
 MESSAGE(STATUS "  Processor: ${NV_SYSTEM_PROCESSOR}")
 MESSAGE(STATUS "  Compiler Flags: ${CMAKE_CXX_FLAGS}")
 
+IF(NVTT_SHARED)
+	SET(NVCORE_SHARED TRUE)
+	SET(NVMATH_SHARED TRUE)
+	SET(NVIMAGE_SHARED TRUE)
+ENDIF(NVTT_SHARED)
+
+
 ADD_SUBDIRECTORY(src)
 
 IF(WIN32)
diff --git a/src/nvcore/CMakeLists.txt b/src/nvcore/CMakeLists.txt
index 349d684..a58236a 100644
--- a/src/nvcore/CMakeLists.txt
+++ b/src/nvcore/CMakeLists.txt
@@ -37,6 +37,10 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 # targets
 ADD_DEFINITIONS(-DNVCORE_EXPORTS)
 
+IF(UNIX)
+	SET(LIBS ${LIBS} ${CMAKE_DL_LIBS})
+ENDIF(UNIX)
+
 IF(NVCORE_SHARED)
 	ADD_LIBRARY(nvcore SHARED ${CORE_SRCS})
 ELSE(NVCORE_SHARED)