Author: mp3butcher
Date: Wed Jan 21 10:12:36 2015
New Revision: 565
URL: http://svn.gna.org/viewcvs/cal3d?rev=565&view=rev
Log:
CMakeLists clean up
Modified:
trunk/cal3d/examples/miniviewer_gl/src/CMakeLists.txt
trunk/cal3d/examples/miniviewer_gl_vp/src/CMakeLists.txt
trunk/cal3d/src/CMakeLists.txt
Modified: trunk/cal3d/examples/miniviewer_gl/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/examples/miniviewer_gl/src/CMakeLists.txt?rev=565&r1=564&r2=565&view=diff
==============================================================================
--- trunk/cal3d/examples/miniviewer_gl/src/CMakeLists.txt (original)
+++ trunk/cal3d/examples/miniviewer_gl/src/CMakeLists.txt Wed Jan 21
10:12:36 2015
@@ -2,7 +2,7 @@
#ADD_DEFINITIONS(-Dx64BIT)
-FIND_PACKAGE(Glut)
+FIND_PACKAGE(GLUT)
#find_package (Threads)
SET(PROJECT_INCLUDES
@@ -39,15 +39,14 @@
SET(ADDITIONALS_LIBS
GL
GLU
- #GLEW
- glut )
+ )
ENDIF(WIN32)
ADD_EXECUTABLE(miniviewer_gl ${PROJECT_SOURCES} )
-TARGET_LINK_LIBRARIES(miniviewer_gl cal3d ${CMAKE_THREAD_LIBS_INIT}
${ADDITIONALS_LIBS} ${GLUT_LIBRARY}
-
+TARGET_LINK_LIBRARIES(miniviewer_gl cal3d ${ADDITIONALS_LIBS}
${GLUT_LIBRARY}
)
+
SET_TARGET_PROPERTIES(miniviewer_gl PROPERTIES PROJECT_LABEL "Application
miniviewer_gl" )
Modified: trunk/cal3d/examples/miniviewer_gl_vp/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/examples/miniviewer_gl_vp/src/CMakeLists.txt?rev=565&r1=564&r2=565&view=diff
==============================================================================
--- trunk/cal3d/examples/miniviewer_gl_vp/src/CMakeLists.txt (original)
+++ trunk/cal3d/examples/miniviewer_gl_vp/src/CMakeLists.txt Wed Jan 21
10:12:36 2015
@@ -3,10 +3,9 @@
#ADD_DEFINITIONS(-Dx64BIT)
-FIND_PACKAGE(Glut REQUIRED)
+FIND_PACKAGE(GLUT REQUIRED)
FIND_PACKAGE(GLEW REQUIRED)
-
-FIND_PACKAGE(OpenSceneGraph REQUIRED)
+
SET(PROJECT_INCLUDES
global.h tga.h tick.h viewer.h
@@ -35,7 +34,6 @@
SET(ADDITIONALS_LIBS
GL
GLU
- GLEW
)
ENDIF(WIN32)
Modified: trunk/cal3d/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/src/CMakeLists.txt?rev=565&r1=564&r2=565&view=diff
==============================================================================
--- trunk/cal3d/src/CMakeLists.txt (original)
+++ trunk/cal3d/src/CMakeLists.txt Wed Jan 21 10:12:36 2015
@@ -45,13 +45,8 @@
)
-#FIND_PACKAGE(Qt4 REQUIRED)
-set(PROJECT_SHADERS
-#vorticity.glsl
-
-)
ADD_DEFINITIONS(-Dx64BIT)
@@ -59,39 +54,10 @@
+ADD_DEFINITIONS(-DCAL3D_EXPORTS)
+ADD_LIBRARY(cal3d SHARED ${PROJECT_SOURCES} )
+TARGET_LINK_LIBRARIES(cal3d ${ADDITIONALS_LIBS}
-
-
-#try somestuff in order to control install target compilation options
-if (cal3d_INSTALL)
-IF(WIN32)
-
-ELSE(WIN32)
-
- #linux only : add GL LIBS
- SET(ADDITIONALS_LIBS GL GLU GLEW )
-
-ENDIF(WIN32)
-else()
-IF(WIN32)
-
-
-ELSE(WIN32)
-
-
-
- #linux only : add GL LIBS
- SET(ADDITIONALS_LIBS GL GLU GLEW )
-
-ENDIF(WIN32)
-
-endif()
-
-
-ADD_DEFINITIONS(-DCAL3D_EXPORTS)
-ADD_LIBRARY(cal3d SHARED ${PROJECT_SOURCES} ${obfuscate_shaders} )
-TARGET_LINK_LIBRARIES(cal3d ${ADDITIONALS_LIBS}
-#glsl_optimizer
)
SET_TARGET_PROPERTIES(cal3d PROPERTIES PROJECT_LABEL "Cal3d Library" )
_______________________________________________
Cal3d-commits mailing list
[email protected]
https://mail.gna.org/listinfo/cal3d-commits
