Revision: 7579
http://playerstage.svn.sourceforge.net/playerstage/?rev=7579&view=rev
Author: gbiggs
Date: 2009-04-07 01:45:21 +0000 (Tue, 07 Apr 2009)
Log Message:
-----------
Changed usage of pkg-config results
Modified Paths:
--------------
code/player/trunk/utils/pmap/CMakeLists.txt
Modified: code/player/trunk/utils/pmap/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/pmap/CMakeLists.txt 2009-04-07 01:35:45 UTC (rev
7578)
+++ code/player/trunk/utils/pmap/CMakeLists.txt 2009-04-07 01:45:21 UTC (rev
7579)
@@ -10,7 +10,7 @@
IF (GSL_PKG_FOUND)
LIST_TO_STRING (GSL_CFLAGS "${GSL_PKG_CFLAGS}")
- LIST_TO_STRING (GSL_LDFLAGS "${GSL_PKG_LDFLAGS}")
+ LINK_DIRECTORIES (${GSL_PKG_LIBRARY_DIRS})
INCLUDE (FindOpenGL)
INCLUDE (FindGLUT)
@@ -35,8 +35,7 @@
IF (GLUT_FOUND)
TARGET_LINK_LIBRARIES (pmaptest ${OPENGL_LIBRARIES}
${GLUT_LIBRARIES})
ENDIF (GLUT_FOUND)
- SET_TARGET_PROPERTIES (pmaptest PROPERTIES
- LINK_FLAGS "${GSL_LDFLAGS}")
+ TARGET_LINK_LIBRARIES (pmaptest ${GSL_PKG_LIBRARIES})
PLAYER_ADD_LIBRARY (pmap ${pmapSrcs})
IF (GLUT_FOUND)
@@ -44,8 +43,7 @@
ENDIF (GLUT_FOUND)
SET_SOURCE_FILES_PROPERTIES (${pmapSrcs} PROPERTIES
COMPILE_FLAGS "${GSL_CFLAGS} --fast-math")
- SET_TARGET_PROPERTIES (pmap PROPERTIES
- LINK_FLAGS "${GSL_LDFLAGS}")
+ TARGET_LINK_LIBRARIES (pmap ${GSL_PKG_LIBRARIES})
PLAYER_ADD_LIBRARY (lodo ${lodoSrcs})
TARGET_LINK_LIBRARIES (lodo playercore)
@@ -54,8 +52,7 @@
ENDIF (GLUT_FOUND)
SET_SOURCE_FILES_PROPERTIES (${lodoSrcs} PROPERTIES
COMPILE_FLAGS "${GSL_CFLAGS} --fast-math")
- SET_TARGET_PROPERTIES (lodo PROPERTIES
- LINK_FLAGS "${GSL_LDFLAGS}")
+ TARGET_LINK_LIBRARIES (lodo ${GSL_PKG_LIBRARIES})
PLAYER_ADD_LIBRARY (lododriver ${lododriverSrcs})
TARGET_LINK_LIBRARIES (lododriver lodo)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit