Skip to content

Commit

Permalink
Fixed quotation in CMakefiles
Browse files Browse the repository at this point in the history
  • Loading branch information
Pedro Rodriguez authored and Pedro Rodriguez committed Nov 24, 2013
1 parent a3d2973 commit ddc2434
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions erizo/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ cmake_minimum_required(VERSION 2.8)

project (ERIZO_ALL)
set (COMPILE_EXAMPLES OFF)
add_subdirectory(${ERIZO_ALL_SOURCES}erizo)
add_subdirectory("${ERIZO_ALL_SOURCES}erizo")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
find_package (Doxygen)
if(DOXYGEN_FOUND)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in" "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile" @ONLY)
add_custom_target(doc
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
${DOXYGEN_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile"
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
COMMENT "Generating API documentation with Doxygen" VERBATIM
)
endif(DOXYGEN_FOUND)

if(COMPILE_EXAMPLES)
include_directories(${ERIZO_ALL_SOURCES}erizo)
include_directories("${ERIZO_ALL_SOURCES}erizo")
set (EXTRA_LIBS ${EXTRA_LIBS} erizo)
add_subdirectory(${ERIZO_ALL_SOURCES}examples)
add_subdirectory("${ERIZO_ALL_SOURCES}examples")
endif(COMPILE_EXAMPLES)
26 changes: 13 additions & 13 deletions erizo/src/erizo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ set(ERIZO_VERSION_MAJOR 0)
set(ERIZO_VERSION_MINOR 1)
set(CMAKE_CXX_FLAGS "-g -Wall")

set(LIB_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../../../build/libdeps/build/lib/)
set(LIB_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../../../build/libdeps/build/lib/")

include_directories(${ERIZO_SOURCE_DIR} ${LIB_DIRS}../include/)
include_directories("${ERIZO_SOURCE_DIR}" "${LIB_DIRS}../include/")

file(GLOB_RECURSE ERIZO_SOURCES ${ERIZO_SOURCE_DIR}/*.h ${ERIZO_SOURCE_DIR}/*.c ${ERIZO_SOURCE_DIR}/*.cpp)
file(GLOB_RECURSE ERIZO_SOURCES "${ERIZO_SOURCE_DIR}/*.h" "${ERIZO_SOURCE_DIR}/*.c" "${ERIZO_SOURCE_DIR}/*.cpp")

add_library(erizo SHARED ${ERIZO_SOURCES})

# GLIB
find_package(Glib REQUIRED)
include_directories(${GLIB_INCLUDE_DIRS})
include_directories("${GLIB_INCLUDE_DIRS}")
target_link_libraries(erizo ${GLIB_LIBRARIES})

# BOOST
Expand All @@ -37,34 +37,34 @@ find_library(GTHREAD gthread-2.0)
test_lib(${GTHREAD})

# SRTP
find_library(SRTP srtp HINTS ${LIB_DIRS})
find_library(SRTP srtp HINTS "${LIB_DIRS}")
test_lib(${SRTP})

# NICE
find_library(NICE nice HINTS ${LIB_DIRS})
find_library(NICE nice HINTS "${LIB_DIRS}")
test_lib(${NICE})

# OPENSSL
find_library(SSL ssl HINTS ${LIB_DIRS})
find_library(SSL ssl HINTS "${LIB_DIRS}")
test_lib(${SSL})
find_library(CRYPTO crypto HINTS ${LIB_DIRS})
find_library(CRYPTO crypto HINTS "${LIB_DIRS}")
test_lib(${CRYPTO})

# Libav
find_library(AVUTIL avutil HINTS ${LIB_DIRS})
find_library(AVUTIL avutil HINTS "${LIB_DIRS}")
test_lib(${AVUTIL})
set (LIBS ${AVUTIL})
find_library(AVCODEC avcodec HINTS ${LIB_DIRS})
find_library(AVCODEC avcodec HINTS "${LIB_DIRS}")
test_lib(${AVCODEC})
set (LIBS ${LIBS} ${AVCODEC})
find_library(AVFORMAT avformat HINTS ${LIB_DIRS})
find_library(AVFORMAT avformat HINTS "${LIB_DIRS}")
test_lib(${AVFORMAT})
set (LIBS ${LIBS} ${AVFORMAT})

# LOG4CXX
find_library(LOG log4cxx)
test_lib(${LOG})

message("Libs ${SRTP} ${NICE} ${GTHREAD} ${SSL} ${CRYPTO} ${LIBS} ${LOG}")
#message("Libs ${SRTP} ${NICE} ${GTHREAD} ${SSL} ${CRYPTO} ${LIBS} ${LOG}")

target_link_libraries(erizo ${SRTP} ${NICE} ${GTHREAD} ${SSL} ${CRYPTO} ${LIBS} ${LOG})
target_link_libraries(erizo ${SRTP} ${NICE} ${GTHREAD} ${SSL} ${CRYPTO} ${LIBS} ${LOG})

0 comments on commit ddc2434

Please sign in to comment.