zynaddsubfx

commit 81589d010ad1def7fe44c68a71b5c3c7b9dfb6f9
parent e57c6d285f10b2f5f9f090c173b64de5d7bd6a08
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Wed, 31 Aug 2011 10:37:56 -0400

Cmake: more linking tweaks

Diffstat:
M
src/CMakeLists.txt
 | 
8
+++-----
M
src/Tests/CMakeLists.txt
 | 
4
++--

2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -231,8 +231,6 @@ set(NONGUI_LIBRARIES
 	zynaddsubfx_nio
 	)
 
-set(CXXTEST_LINK_LIBS ${NONGUI_LIBRARIES})
-
 add_subdirectory(Misc)
 add_subdirectory(Synth)
 add_subdirectory(Effects)
@@ -275,8 +273,8 @@ if (DssiEnable)
 	target_link_libraries(zynaddsubfx_dssi
 		${NONGUI_LIBRARIES}
 		${ZLIB_LIBRARIES}
-		${FFTW_LIBRARIES}
-		${MXML_LIBRARIES}
+		${FFTW_LIBRARY}
+		${MXML_LIBRARY}
 		${NIO_LIBRARIES}
 		${AUDIO_LIBRARIES}
 		${OS_LIBRARIES}
@@ -288,7 +286,7 @@ if (DssiEnable)
 	endif ()
 endif()
 
-message(STATUS "Link libraries: ${ZLIB_LIBRARIES} ${FFTW_LIBRARIES} ${MXML_LIBRARIES} ${AUDIO_LIBRARIES} ${OS_LIBRARIES}")
+message(STATUS "Link libraries: ${ZLIB_LIBRARY} ${FFTW_LIBRARY} ${MXML_LIBRARY} ${AUDIO_LIBRARIES} ${OS_LIBRARIES}")
 install(TARGETS zynaddsubfx
 	RUNTIME DESTINATION bin
 	)
diff --git a/src/Tests/CMakeLists.txt b/src/Tests/CMakeLists.txt
@@ -11,8 +11,8 @@ CXXTEST_ADD_TEST(ADnoteTest AdNoteTest.cpp
 CXXTEST_ADD_TEST(SUBnoteTest SubNoteTest.cpp ${CMAKE_CURRENT_SOURCE_DIR}/SubNoteTest.h)
 CXXTEST_ADD_TEST(OscilGenTest OscilGenTest.cpp ${CMAKE_CURRENT_SOURCE_DIR}/OscilGenTest.h)
 
-set(test_lib ${NONGUI_LIBRARIES} ${ZLIB_LIBRARIES} ${FFTW_LIBRARIES}
-    ${MXML_LIBRARIES})
+set(test_lib ${NONGUI_LIBRARIES} ${ZLIB_LIBRARY} ${FFTW_LIBRARY} ${MXML_LIBRARY})
+message(STATUS "Linking tests with: ${test_lib}")
 target_link_libraries(ADnoteTest     ${test_lib})
 target_link_libraries(SUBnoteTest    ${test_lib})
 target_link_libraries(ControllerTest ${test_lib})