Commit 90e0ed89 authored by Alex Mantel's avatar Alex Mantel

Set correct variables for subprojects, fix install

parent 2da37d13
...@@ -132,7 +132,7 @@ include_directories(${INCLUDE_DIRS}) ...@@ -132,7 +132,7 @@ include_directories(${INCLUDE_DIRS})
# install includes from core # install includes from core
install(DIRECTORY libcaf_core/caf/ DESTINATION include/caf FILES_MATCHING PATTERN "*.hpp") install(DIRECTORY libcaf_core/caf/ DESTINATION include/caf FILES_MATCHING PATTERN "*.hpp")
install(DIRECTORY libcaf_io/cppa/ DESTINATION include/cppa FILES_MATCHING PATTERN "*.hpp") install(DIRECTORY libcaf_core/cppa/ DESTINATION include/cppa FILES_MATCHING PATTERN "*.hpp")
# install includes from io # install includes from io
install(DIRECTORY libcaf_io/caf/ DESTINATION include/caf FILES_MATCHING PATTERN "*.hpp") install(DIRECTORY libcaf_io/caf/ DESTINATION include/caf FILES_MATCHING PATTERN "*.hpp")
...@@ -160,6 +160,9 @@ add_subdirectory(libcaf_io) ...@@ -160,6 +160,9 @@ add_subdirectory(libcaf_io)
# set io lib for sub directories # set io lib for sub directories
set (LIBCAF_IO_LIBRARY libcaf_io) set (LIBCAF_IO_LIBRARY libcaf_io)
add_dependencies(libcaf_io libcaf_core) add_dependencies(libcaf_io libcaf_core)
# set list variable for sub directories
set (LIBCAF_LIBRARIES ${LIBCAF_CORE_LIBRARY} ${LIBCAF_IO_LIBRARY})
if (NOT "${CAF_NO_UNIT_TESTS}" STREQUAL "yes") if (NOT "${CAF_NO_UNIT_TESTS}" STREQUAL "yes")
enable_testing() enable_testing()
add_subdirectory(unit_testing) add_subdirectory(unit_testing)
......
...@@ -15,8 +15,7 @@ macro(add name folder) ...@@ -15,8 +15,7 @@ macro(add name folder)
add_executable(${name} ${folder}/${name}.cpp ${ARGN}) add_executable(${name} ${folder}/${name}.cpp ${ARGN})
target_link_libraries(${name} target_link_libraries(${name}
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
${LIBCAF_CORE_LIBRARY} ${LIBCAF_LIBRARIES}
${LIBCAF_IO_LIBRARY}
${PTHREAD_LIBRARIES} ${PTHREAD_LIBRARIES}
${WSLIB}) ${WSLIB})
add_dependencies(${name} all_examples) add_dependencies(${name} all_examples)
...@@ -55,7 +54,7 @@ if (NOT "${CAF_NO_CURL_EXAMPLES}" STREQUAL "yes") ...@@ -55,7 +54,7 @@ if (NOT "${CAF_NO_CURL_EXAMPLES}" STREQUAL "yes")
find_package(CURL) find_package(CURL)
if (CURL_FOUND) if (CURL_FOUND)
add_executable(curl_fuse curl/curl_fuse.cpp) add_executable(curl_fuse curl/curl_fuse.cpp)
target_link_libraries(curl_fuse ${CMAKE_DL_LIBS} ${CAF_LIBRARY} ${PTHREAD_LIBRARIES} ${CURL_LIBRARY}) target_link_libraries(curl_fuse ${CMAKE_DL_LIBS} ${LIBCAF_LIBRARIES} ${PTHREAD_LIBRARIES} ${CURL_LIBRARY})
add_dependencies(curl_fuse all_examples) add_dependencies(curl_fuse all_examples)
endif (CURL_FOUND) endif (CURL_FOUND)
endif () endif ()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment