zynaddsubfx

commit b537b01069f7194ee06f9808c6f40a7226af0dc2
parent ad05e2903cb599b00aee7e7177e1ce09b6ed1f4e
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Sun, 28 Aug 2011 09:37:46 -0400

Cmake: fixing bugs introduced in last commit

Diffstat:
M
cmake/FindOSS.cmake
 | 
2
+-
M
cmake/Findzlib.cmake
 | 
22
+++++++++++-----------
M
src/CMakeLists.txt
 | 
11
+++++++----
M
src/Tests/CMakeLists.txt
 | 
2
+-

4 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/cmake/FindOSS.cmake b/cmake/FindOSS.cmake
@@ -3,7 +3,7 @@ find_path(OSS_INCLUDE_DIR sys/soundcard.h)
 set(OSS_LIBRARIES True)
 mark_as_advanced(OSS_INCLUDE_DIR)
 
-# handle the QUIETLY and REQUIRED arguments and set zlib_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set OSS_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSS DEFAULT_MSG OSS_LIBRARIES OSS_INCLUDE_DIR)
diff --git a/cmake/Findzlib.cmake b/cmake/Findzlib.cmake
@@ -18,22 +18,22 @@
 # (To distributed this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-IF (zlib_INCLUDE_DIR)
+IF (ZLIB_INCLUDE_DIR)
   # Already in cache, be silent
-  SET(zlib_FIND_QUIETLY TRUE)
-ENDIF (zlib_INCLUDE_DIR)
+  SET(ZLIB_FIND_QUIETLY TRUE)
+ENDIF (ZLIB_INCLUDE_DIR)
 
-FIND_PATH(zlib_INCLUDE_DIR zlib.h)
+FIND_PATH(ZLIB_INCLUDE_DIR zlib.h)
 
-SET(zlib_NAMES z zlib zdll)
-FIND_LIBRARY(zlib_LIBRARY NAMES ${zlib_NAMES} )
-MARK_AS_ADVANCED( zlib_LIBRARY zlib_INCLUDE_DIR )
+SET(ZLIB_NAMES z zlib zdll)
+FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} )
+MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
 
 # Per-recommendation
-SET(zlib_INCLUDE_DIRS "${zlib_INCLUDE_DIR}")
-SET(zlib_LIBRARIES    "${zlib_LIBRARY}")
+SET(ZLIB_INCLUDE_DIRS "${ZLIB_INCLUDE_DIR}")
+SET(ZLIB_LIBRARIES    "${ZLIB_LIBRARY}")
 
-# handle the QUIETLY and REQUIRED arguments and set zlib_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(zlib DEFAULT_MSG zlib_LIBRARIES zlib_INCLUDE_DIRS)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARIES ZLIB_INCLUDE_DIRS)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -135,6 +135,9 @@ if(LashEnable)
 	message(STATUS "Compiling with lash")
 endif()
 
+# other include directories
+include_directories(${ZLIB_INCLUDE_DIRS} ${MXML_INCLUDE_DIRS})
+
 add_definitions(
 	 -DASM_F2I_YES
          -g #TODO #todo put in a better location
@@ -248,8 +251,8 @@ add_executable(zynaddsubfx
 target_link_libraries(zynaddsubfx
 	${NONGUI_LIBRARIES}
 	${GUI_LIBRARIES}
-	${zlib_LIBRARIES}
-	${fftw_LIBRARIES}
+	${ZLIB_LIBRARIES}
+	${FFTW_LIBRARIES}
 	${MXML_LIBRARIES}
 	${NIO_LIBRARIES}
 	${AUDIO_LIBRARIES}
@@ -264,8 +267,8 @@ if (DssiEnable)
 
 	target_link_libraries(zynaddsubfx_dssi
 		${NONGUI_LIBRARIES}
-		${zlib_LIBRARIES}
-		${fftw_LIBRARIES}
+		${ZLIB_LIBRARIES}
+		${FFTW_LIBRARIES}
 		${MXML_LIBRARIES}
 		${NIO_LIBRARIES}
 		${AUDIO_LIBRARIES}
diff --git a/src/Tests/CMakeLists.txt b/src/Tests/CMakeLists.txt
@@ -11,7 +11,7 @@ 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}
+set(test_lib ${NONGUI_LIBRARIES} ${ZLIB_LIBRARIES} ${FFTW_LIBRARIES}
     ${MXML_LIBRARIES})
 target_link_libraries(ADnoteTest     ${test_lib})
 target_link_libraries(SUBnoteTest    ${test_lib})