Permalink
Browse files

Remove OsspUuid deps from CMakeList + remove -O2 and -NDebug whilst w…

…e're still developing
  • Loading branch information...
1 parent 8971100 commit 587d0c44b583ab93a19ea6c11ffff3e69c71ec45 @jonocole jonocole committed Apr 23, 2009
Showing with 1 addition and 30 deletions.
  1. +1 −5 CMakeLists.txt
  2. +0 −25 CMakeModules/FindOsspUuid.cmake
View
@@ -16,12 +16,10 @@ SET(Boost_USE_STATIC_LIBS ON)
SET(Boost_USE_MULTITHREADED ON)
FIND_PACKAGE(Boost 1.35 REQUIRED COMPONENTS filesystem system regex thread program_options date_time)
FIND_PACKAGE(Taglib 1.5.0 REQUIRED)
-FIND_PACKAGE(OsspUuid REQUIRED)
FIND_PACKAGE(Sqlite3 REQUIRED)
FIND_PACKAGE(CURL REQUIRED)
INCLUDE_DIRECTORIES(
${PLAYDAR_PATH}/includes # playdar includes
- ${OSSPUUID_INCLUDE_DIR}
${Boost_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
${TAGLIB_INCLUDES}
@@ -57,7 +55,7 @@ ENDIF(WIN32)
IF(NOT WIN32)
# removes operators like "and", "or" and "not"
ADD_DEFINITIONS(-Wall) # -ggdb
- ADD_DEFINITIONS(-g -O2 -DNDEBUG)
+ ADD_DEFINITIONS(-g )
ADD_DEFINITIONS(-fno-operator-names)
ENDIF(NOT WIN32)
@@ -71,7 +69,6 @@ ADD_EXECUTABLE(scanner # EXCLUDE_FROM_ALL <--whatdoesthismean?--mxcl
TARGET_LINK_LIBRARIES(scanner
${SQLITE3_LIBRARIES}
${Boost_LIBRARIES}
- ${OSSPUUID_LIBRARIES}
${TAGLIB_LIBRARIES})
ADD_EXECUTABLE( playdar
@@ -115,7 +112,6 @@ TARGET_LINK_LIBRARIES( playdar
${CURL_LIBRARIES}
${TAGLIB_LIBRARIES} # LGPL/MPL
${SQLITE3_LIBRARIES} # public domain
- ${OSSPUUID_LIBRARIES} # BSD-like
${Boost_LIBRARIES} # Boost license
)
@@ -1,25 +0,0 @@
-# Created by Max Howell
-
-FIND_LIBRARY (OSSPUUID_LIBRARIES NAMES ossp-uuid uuid)
-FIND_PATH (OSSPUUID_INCLUDE_DIR NAMES ossp/uuid.h uuid.h)
-
-# the source install doesn't prefix with an ossp folder, everyone with sense, does.
-FIND_FILE (HAS_OSSP_NAMESPACE_FOLDER ossp/uuid.h)
-IF (HAS_OSSP_NAMESPACE_FOLDER)
- ADD_DEFINITIONS( -DHAS_OSSP_UUID_H )
-ENDIF (HAS_OSSP_NAMESPACE_FOLDER)
-
-INCLUDE (FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OsspUuid DEFAULT_MSG OSSPUUID_LIBRARIES OSSPUUID_INCLUDE_DIR)
-
-IF (OSSPUUID_FOUND)
- INCLUDE (CheckLibraryExists)
- CHECK_LIBRARY_EXISTS (${OSSPUUID_LIBRARIES} uuid_create "" OSSPUUID_FOUND_SYMBOL)
-
- IF (!OSSPUUID_FOUND_SYMBOL)
- MESSAGE( FATAL_ERROR "Your libossp-uuid is not what we expected" )
- SET (URIPARSER_FOUND FALSE)
- ENDIF (!OSSPUUID_FOUND_SYMBOL)
-ENDIF (OSSPUUID_FOUND)
-
-MARK_AS_ADVANCED (OSSPUUID_INCLUDE_DIR OSSPUUID_LIBRARIES)

0 comments on commit 587d0c4

Please sign in to comment.