Skip to content

Commit

Permalink
Remove OsspUuid deps from CMakeList + remove -O2 and -NDebug whilst w…
Browse files Browse the repository at this point in the history
…e're still developing
  • Loading branch information
jonocole committed Apr 23, 2009
1 parent 8971100 commit 587d0c4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 30 deletions.
6 changes: 1 addition & 5 deletions CMakeLists.txt
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@ SET(Boost_USE_STATIC_LIBS ON)
SET(Boost_USE_MULTITHREADED ON) SET(Boost_USE_MULTITHREADED ON)
FIND_PACKAGE(Boost 1.35 REQUIRED COMPONENTS filesystem system regex thread program_options date_time) FIND_PACKAGE(Boost 1.35 REQUIRED COMPONENTS filesystem system regex thread program_options date_time)
FIND_PACKAGE(Taglib 1.5.0 REQUIRED) FIND_PACKAGE(Taglib 1.5.0 REQUIRED)
FIND_PACKAGE(OsspUuid REQUIRED)
FIND_PACKAGE(Sqlite3 REQUIRED) FIND_PACKAGE(Sqlite3 REQUIRED)
FIND_PACKAGE(CURL REQUIRED) FIND_PACKAGE(CURL REQUIRED)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PLAYDAR_PATH}/includes # playdar includes ${PLAYDAR_PATH}/includes # playdar includes
${OSSPUUID_INCLUDE_DIR}
${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR} ${SQLITE3_INCLUDE_DIR}
${TAGLIB_INCLUDES} ${TAGLIB_INCLUDES}
Expand Down Expand Up @@ -57,7 +55,7 @@ ENDIF(WIN32)
IF(NOT WIN32) IF(NOT WIN32)
# removes operators like "and", "or" and "not" # removes operators like "and", "or" and "not"
ADD_DEFINITIONS(-Wall) # -ggdb ADD_DEFINITIONS(-Wall) # -ggdb
ADD_DEFINITIONS(-g -O2 -DNDEBUG) ADD_DEFINITIONS(-g )
ADD_DEFINITIONS(-fno-operator-names) ADD_DEFINITIONS(-fno-operator-names)
ENDIF(NOT WIN32) ENDIF(NOT WIN32)


Expand All @@ -71,7 +69,6 @@ ADD_EXECUTABLE(scanner # EXCLUDE_FROM_ALL <--whatdoesthismean?--mxcl
TARGET_LINK_LIBRARIES(scanner TARGET_LINK_LIBRARIES(scanner
${SQLITE3_LIBRARIES} ${SQLITE3_LIBRARIES}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${OSSPUUID_LIBRARIES}
${TAGLIB_LIBRARIES}) ${TAGLIB_LIBRARIES})


ADD_EXECUTABLE( playdar ADD_EXECUTABLE( playdar
Expand Down Expand Up @@ -115,7 +112,6 @@ TARGET_LINK_LIBRARIES( playdar
${CURL_LIBRARIES} ${CURL_LIBRARIES}
${TAGLIB_LIBRARIES} # LGPL/MPL ${TAGLIB_LIBRARIES} # LGPL/MPL
${SQLITE3_LIBRARIES} # public domain ${SQLITE3_LIBRARIES} # public domain
${OSSPUUID_LIBRARIES} # BSD-like
${Boost_LIBRARIES} # Boost license ${Boost_LIBRARIES} # Boost license
) )


Expand Down
25 changes: 0 additions & 25 deletions CMakeModules/FindOsspUuid.cmake

This file was deleted.

0 comments on commit 587d0c4

Please sign in to comment.