Diff of /CMakeLists.txt [86d82a] .. [e67bcd] Maximize Restore

  Switch to side-by-side view

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,7 +105,6 @@
 	set(HAVE_PTHREAD_H TRUE)
 endif()
 set (UCOMMON_LIBS ${UCOMMON_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${WITH_LDFLAGS}) 
-set (MATH_LIB "")
 
 if ((WIN32 AND CMAKE_COMPILER_IS_GNUCXX) OR MINGW OR MSYS)
 	set (UCOMMON_LIBS --enable-stdcall-fixup ${UCOMMON_LIBS} mingwex mingw32)
@@ -156,11 +155,6 @@
 	if (HAVE_RT_LIB)
 		set(UCOMMON_LIBS ${UCOMMON_LIBS} rt)
 	endif()
-endif()
-
-check_library_exists(m sqrt "" HAVE_MATHLIB)
-if (HAVE_MATHLIB)
-	set(MATH_LIB m)
 endif()
 
 # this may have to change for mswindows...
@@ -270,40 +264,24 @@
 	endif()
 endif()
 
-file(GLOB audio_src audio/*.cpp)
 file(GLOB common_src common/*.cpp)
-file(GLOB script_src script/*.cpp)
 file(GLOB ucommon_inc inc/ucommon/*.h)
 
 if(HAVE_OPENSSL)
 	file(GLOB secure_src openssl/*.cpp)
 	set(SECURE_LIBS ssl crypto)
 else()
-	file(GLOB secure_src insecure/*.cpp)
+	file(GLOB secure_src nossl/*.cpp)
 endif()
 
 add_library(ucommon ${BUILD_LIBRARY_TYPE} ${common_src})
 set_target_properties(ucommon PROPERTIES VERSION ${VERSION} SOVERSION ${SOVERSION})
 target_link_libraries(ucommon ${UCOMMON_LIBS} ${WITH_LIBS})
 
-add_library(uccscript ${BUILD_LIBRARY_TYPE} ${script_src})
-set_target_properties(uccscript PROPERTIES VERSION ${VERSION} SOVERSION ${SOVERSION})
-target_link_libraries(uccscript ${UCOMMON_LIBS} ${WITH_LIBS})
-add_dependencies(uccscript ucommon)
-
-add_library(uccaudio ${BUILD_LIBRARY_TYPE} ${audio_src})
-set_target_properties(uccaudio PROPERTIES VERSION ${VERSION} SOVERSION ${SOVERSION})
-target_link_libraries(uccaudio ucommon ${UCOMMON_LIBS} ${WITH_LIBS} ${MATH_LIB})
-add_dependencies(uccaudio ucommon)
-
-add_library(uccsecure ${BUILD_LIBRARY_TYPE} ${secure_src})
-set_target_properties(uccsecure PROPERTIES VERSION ${VERSION} SOVERSION ${SOVERSION})
-target_link_libraries(uccsecure ucommon ${UCOMMON_LIBS} ${WITH_LIBS} ${SECURE_LIBS})
-add_dependencies(uccsecure ucommon)
-
-add_executable(audiotool utils/audiotool.cpp)
-add_dependencies(audiotool uccaudio ucommon)
-target_link_libraries(audiotool uccaudio ucommon ${UCOMMON_LIBS} ${WITH_LIBS} ${MATH_LIB})
+add_library(usecure ${BUILD_LIBRARY_TYPE} ${secure_src})
+set_target_properties(usecure PROPERTIES VERSION ${VERSION} SOVERSION ${SOVERSION})
+target_link_libraries(usecure ucommon ${UCOMMON_LIBS} ${WITH_LIBS} ${SECURE_LIBS})
+add_dependencies(usecure ucommon)
 
 add_executable(args utils/args.cpp)
 add_dependencies(args ucommon)
@@ -399,7 +377,6 @@
 endif(NOT WIN32)
 
 install(FILES   ${ucommon_inc}  DESTINATION include/ucommon  COMPONENT headers)
-install(TARGETS ucommon uccscript uccaudio DESTINATION lib${LIB_SUFFIX} COMPONENT libraries)
-install(TARGETS audiotool DESTINATION bin)
+install(TARGETS ucommon usecure DESTINATION lib${LIB_SUFFIX} COMPONENT libraries)
 install(TARGETS args DESTINATION bin)