Add missing math lib to fakenect

Fix the missing dependency of fakenect on the math lib and remove the unecessary one of record. On the way centralizes definition of MATH_LIB since several wrappers and examples uses it. Signed-off-by: Nicolas Bourdaud <[email protected]>
najlepsiwebdesigner · Mar 10, 2012 · ad42c6f · ad42c6f
1 parent f8a55dd
commit ad42c6f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -86,6 +86,12 @@ if(BUILD_AUDIO)
   add_definitions(-DBUILD_AUDIO)
 endif()
 
+if (WIN32)
+   set(MATH_LIB "")
+else(WIN32)
+  set(MATH_LIB "m")
+endif()
+
 ######################################################################################
 # CMake 
 ######################################################################################

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -58,12 +58,6 @@ else()
 
   include_directories(${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS} ${USB_INCLUDE_DIRS})
 
-  if (WIN32)
-    set(MATH_LIB "")
-  else(WIN32)
-    set(MATH_LIB "m")
-  endif()
-
   target_link_libraries(glview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
   target_link_libraries(regview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
   target_link_libraries(hiview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})

diff --git a/fakenect/CMakeLists.txt b/fakenect/CMakeLists.txt
@@ -8,12 +8,13 @@ set_target_properties ( fakenect PROPERTIES
   VERSION ${PROJECT_VER}
   SOVERSION ${PROJECT_APIVER}
   OUTPUT_NAME freenect)
+target_link_libraries(fakenect ${MATH_LIB})
 
 install (TARGETS fakenect
   DESTINATION "${PROJECT_LIBRARY_INSTALL_DIR}/fakenect")
 
 add_executable(record record.c)
-target_link_libraries(record freenect m)
+target_link_libraries(record freenect)
 install (TARGETS record
   DESTINATION bin)
 

diff --git a/wrappers/actionscript/CMakeLists.txt b/wrappers/actionscript/CMakeLists.txt
@@ -25,12 +25,6 @@ if(APPLE)
 	set(CMAKE_EXE_LINKER_FLAGS "-framework CoreFoundation -framework IOKit")
 else(APPLE)
 	find_package(Threads REQUIRED)
-	if (WIN32)
-	   set(MATH_LIB "")
-	else(WIN32)
-	  set(MATH_LIB "m")
-	endif()
-
 endif()
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../wrappers/c_sync)
 

diff --git a/wrappers/cpp/CMakeLists.txt b/wrappers/cpp/CMakeLists.txt
@@ -27,12 +27,6 @@ else()
 
   include_directories(${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS} ${USB_INCLUDE_DIRS})
 
-  if (WIN32)
-    set(MATH_LIB "")
-  else(WIN32)
-    set(MATH_LIB "m")
-  endif()
-
   target_link_libraries(cppview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
 endif()