Text archives Help

---

Author: bigler
Date: Wed Dec  5 14:19:38 2007
New Revision: 1910

Modified:
   trunk/CMakeLists.txt
   trunk/Core/CMakeLists.txt
   trunk/Core/Util/Preprocessor.h
   trunk/Engine/CMakeLists.txt
   trunk/StandAlone/CMakeLists.txt
   trunk/SwigInterface/CMakeLists.txt
   trunk/scenes/CMakeLists.txt
   trunk/tests/CMakeLists.txt
Log:
CMakeLists.txt

  Added SYSTEM_MATH_LIB that removes the -lm for non unix machines.

  Added SYSTEM_MATH_LIB to the MANTA_TARGET_LINK_LIBRARIES.

Core/CMakeLists.txt

  Removed some libraries that weren't being defined.

  Added pthread library to the link.

Core/Util/Preprocessor.h

  Added missing newline to quiet warning.

Engine/CMakeLists.txt

  Removed commented out Animators directory.  It doesn't exit in the
  repository.

StandAlone/CMakeLists.txt
SwigInterface/CMakeLists.txt
scenes/CMakeLists.txt
tests/CMakeLists.txt

  Updates for library linkage.  Link OPENGL_LIBRARIES and
  X11_LIBRARIES to the libraries that actually call the code.  CMake
  make sure the transitive linking works for us.


Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt        (original)
+++ trunk/CMakeLists.txt        Wed Dec  5 14:19:38 2007
@@ -78,14 +78,21 @@
 # Find Threads
 INCLUDE (${CMAKE_ROOT}/Modules/FindThreads.cmake)
 
-SET(USE_STATS_COLLECTOR 0 CACHE BOOL "Enable stats collection")
-
 
###############################################################################
 
###############################################################################
-# OPTIONAL PROGRAMS AND LIBRARIES
+# Set some system level stuff
 
###############################################################################
 
###############################################################################
 
+# Only unix systems need the math library
+IF(UNIX)
+  SET(SYSTEM_MATH_LIB -lm)
+ELSE(UNIX)
+  SET(SYSTEM_MATH_LIB)
+ENDIF(UNIX)
+
+SET(USE_STATS_COLLECTOR 0 CACHE BOOL "Enable stats collection")
+
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "Single 
output directory for building all libraries.")
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "Single 
output directory for building all executables.")
 
@@ -104,6 +111,7 @@
   Manta_Interface
   Manta_Core
   About
+  ${SYSTEM_MATH_LIB}
   )
 
 IF(MANTA_ENABLE_X11)

Modified: trunk/Core/CMakeLists.txt
==============================================================================
--- trunk/Core/CMakeLists.txt   (original)
+++ trunk/Core/CMakeLists.txt   Wed Dec  5 14:19:38 2007
@@ -133,12 +133,12 @@
 ELSE(CMAKE_USE_PTHREADS_INIT)
   IF(WIN32)
     SET (CORE_SOURCES ${CORE_SOURCES}
-                Exceptions/StackWalker.h
-                Exceptions/StackWalker.cc
-         Thread/Thread_win32.cc
-         Thread/Time_win32.cc
-         Thread/Time.h
-         )         
+      Exceptions/StackWalker.h
+      Exceptions/StackWalker.cc
+      Thread/Thread_win32.cc
+      Thread/Time_win32.cc
+      Thread/Time.h
+      )         
   ENDIF(WIN32)
 ENDIF (CMAKE_USE_PTHREADS_INIT)
 
@@ -176,20 +176,13 @@
   TARGET_LINK_LIBRARIES(Manta_Core ${LIBXML2_LIBRARY})
 ENDIF(LIBXML2_LIBRARY)
 
-
-TARGET_LINK_LIBRARIES(Manta_Core
-  ${THREAD_LIBRARY}  
-  ${TRACEBACK_LIB} 
-  ${SEMAPHORE_LIBRARY}
-)
-
 IF (CMAKE_USE_PTHREADS_INIT)
-  # no need for Win32 timer (we'll use Cygwin version)
+  TARGET_LINK_LIBRARIES(Manta_Core ${CMAKE_THREAD_LIBS_INIT})
 ELSE(CMAKE_USE_PTHREADS_INIT)
   IF(WIN32)
-       TARGET_LINK_LIBRARIES(Manta_Core Winmm.lib)
+    TARGET_LINK_LIBRARIES(Manta_Core Winmm.lib)
   ENDIF(WIN32)
-ENDIF (CMAKE_USE_PTHREADS_INIT)
+ENDIF(CMAKE_USE_PTHREADS_INIT)
 
 IF(MANTA_ENABLE_X11)
   # The Manta_Core_XUtils library

Modified: trunk/Core/Util/Preprocessor.h
==============================================================================
--- trunk/Core/Util/Preprocessor.h      (original)
+++ trunk/Core/Util/Preprocessor.h      Wed Dec  5 14:19:38 2007
@@ -35,4 +35,4 @@
 #define MANTA_PLUGINEXPORT extern "C"
 #endif
 
-#endif // MANTA_CORE_UTIL_MANTA_PREPROCESSOR_H_
\ No newline at end of file
+#endif // MANTA_CORE_UTIL_MANTA_PREPROCESSOR_H_

Modified: trunk/Engine/CMakeLists.txt
==============================================================================
--- trunk/Engine/CMakeLists.txt (original)
+++ trunk/Engine/CMakeLists.txt Wed Dec  5 14:19:38 2007
@@ -8,7 +8,6 @@
 INCLUDE (Renderers/CMakeLists.txt)
 INCLUDE (SampleGenerators/CMakeLists.txt)
 INCLUDE (Shadows/CMakeLists.txt)
-# INCLUDE (Animators/CMakeLists.txt)
 
 ADD_LIBRARY (Manta_Engine
              ${Manta_Control_SRCS}
@@ -17,10 +16,9 @@
              ${Manta_ImageTraversers_SRCS}
              ${Manta_LoadBalancers_SRCS}
              ${Manta_PixelSamplers_SRCS}
-            ${Manta_SampleGenerators_SRCS}
+             ${Manta_SampleGenerators_SRCS}
              ${Manta_Renderers_SRCS}
              ${Manta_Shadows_SRCS}
-#             ${Manta_Animators_SRCS}
              )
 
 

Modified: trunk/StandAlone/CMakeLists.txt
==============================================================================
--- trunk/StandAlone/CMakeLists.txt     (original)
+++ trunk/StandAlone/CMakeLists.txt     Wed Dec  5 14:19:38 2007
@@ -2,11 +2,6 @@
 ADD_EXECUTABLE(manta manta.cc)
 TARGET_LINK_LIBRARIES(manta ${MANTA_TARGET_LINK_LIBRARIES})
 
- TARGET_LINK_LIBRARIES(manta ${CMAKE_THREAD_LIBS_INIT}
-                             ${OPENGL_LIBRARIES}
-                             ${X11_LIBRARIES}
-                             -lm)
-
 IF(BUILD_TESTING)
   ADD_TEST(DefaultSceneNoDisplayBench_NP1 ${CMAKE_BINARY_DIR}/bin/manta -np 
1 -nodisplaybench-dart 200 20)
   ADD_TEST(DefaultSceneNoDisplayBench_NP2 ${CMAKE_BINARY_DIR}/bin/manta -np 
2 -nodisplaybench-dart 400 40)
@@ -17,8 +12,7 @@
 SET (BUILD_OCTVOL_BUILD 0 CACHE BOOL "Include .v3c1 tools")
 IF (BUILD_OCTVOL_BUILD) 
   ADD_EXECUTABLE(octvol_build octvol_build.cc)
-  TARGET_LINK_LIBRARIES(octvol_build Manta_Model Manta_Engine
-                                     ${CMAKE_THREAD_LIBS_INIT} -lm)
+  TARGET_LINK_LIBRARIES(octvol_build Manta_Model Manta_Engine 
${SYSTEM_MATH_LIB})
 ENDIF(BUILD_OCTVOL_BUILD) 
                                   
 SET (BUILD_SAVESCENE FALSE CACHE BOOL "Build the scene read/write program 
(savescene)")
@@ -36,9 +30,8 @@
     INCLUDE_DIRECTORIES(${GLUT_INCLUDE_DIR})
     ADD_EXECUTABLE(displaytest displaytest.cc)
     TARGET_LINK_LIBRARIES(displaytest ${MANTA_TARGET_LINK_LIBRARIES}
-                                      ${CMAKE_THREAD_LIBS_INIT}
                                       ${GLUT_LIBRARIES}
-                                      -lm)
+                                      )
   ELSE (GLUT_FOUND)
     # Couldn't find it.
     MESSAGE("Need GLUT for BUILD_DISPLAY_TEST.  Turning off.")

Modified: trunk/SwigInterface/CMakeLists.txt
==============================================================================
--- trunk/SwigInterface/CMakeLists.txt  (original)
+++ trunk/SwigInterface/CMakeLists.txt  Wed Dec  5 14:19:38 2007
@@ -61,10 +61,7 @@
 SWIG_LINK_LIBRARIES(mantainterface
   ${PYTHON_LIBRARIES}
   ${MANTA_TARGET_LINK_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT}
-  ${OPENGL_LIBRARIES}
-  ${X11_LIBRARIES}
-  -lm)
+  )
 ADD_DEPENDENCIES(_mantainterface ${MANTA_TARGET_LINK_LIBRARIES})
 
 IF (APPLE_LEOPARD_LD)
@@ -103,10 +100,7 @@
 SWIG_LINK_LIBRARIES(manta
   ${PYTHON_LIBRARIES}
   ${MANTA_TARGET_LINK_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT}
-  ${OPENGL_LIBRARIES}
-  ${X11_LIBRARIES}
-  -lm)
+  )
 ADD_DEPENDENCIES(_manta ${MANTA_TARGET_LINK_LIBRARIES})
 
 

Modified: trunk/scenes/CMakeLists.txt
==============================================================================
--- trunk/scenes/CMakeLists.txt (original)
+++ trunk/scenes/CMakeLists.txt Wed Dec  5 14:19:38 2007
@@ -6,10 +6,6 @@
 
 SET(MANTA_SCENE_LINK 
   ${MANTA_TARGET_LINK_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT}
-  ${OPENGL_LIBRARIES} 
-  ${X11_LIBRARIES} 
-  -lm
   )
 
 # Basic test scene.

Modified: trunk/tests/CMakeLists.txt
==============================================================================
--- trunk/tests/CMakeLists.txt  (original)
+++ trunk/tests/CMakeLists.txt  Wed Dec  5 14:19:38 2007
@@ -2,5 +2,4 @@
 SUBDIRS( perftest )
 
 ADD_EXECUTABLE(atomic_counter atomic_counter.cc)
-TARGET_LINK_LIBRARIES(atomic_counter ${MANTA_TARGET_LINK_LIBRARIES}
-                                    ${CMAKE_THREAD_LIBS_INIT})
+TARGET_LINK_LIBRARIES(atomic_counter ${MANTA_TARGET_LINK_LIBRARIES})

---

• [Manta] r1910 - in trunk: . Core Core/Util Engine StandAlone SwigInterface scenes tests, bigler, 12/05/2007

---

Archive powered by MHonArc 2.6.16.