Unverified Commit 8b0721e7 authored by Dominik Charousset's avatar Dominik Charousset Committed by GitHub

Merge pull request #1032

Suppress flag and compiler setup in subdir mode
parents eae5dcd3 a94f6b2e
This diff is collapsed.
...@@ -2,7 +2,7 @@ project(caf_examples CXX) ...@@ -2,7 +2,7 @@ project(caf_examples CXX)
add_custom_target(all_examples) add_custom_target(all_examples)
include_directories(${LIBCAF_INCLUDE_DIRS}) include_directories(${CAF_INCLUDE_DIRS})
macro(add folder name) macro(add folder name)
add_executable(${name} ${folder}/${name}.cpp ${ARGN}) add_executable(${name} ${folder}/${name}.cpp ${ARGN})
......
...@@ -3,7 +3,7 @@ project(caf_examples_opencl CXX) ...@@ -3,7 +3,7 @@ project(caf_examples_opencl CXX)
if(OpenCL_LIBRARIES AND NOT CAF_NO_EXAMPLES) if(OpenCL_LIBRARIES AND NOT CAF_NO_EXAMPLES)
add_custom_target(opencl_examples) add_custom_target(opencl_examples)
include_directories(${LIBCAF_INCLUDE_DIRS}) include_directories(${CAF_INCLUDE_DIRS})
if(${CMAKE_SYSTEM_NAME} MATCHES "Window") if(${CMAKE_SYSTEM_NAME} MATCHES "Window")
set(WSLIB -lws2_32) set(WSLIB -lws2_32)
else() else()
......
...@@ -2,7 +2,7 @@ project(caf_tools CXX) ...@@ -2,7 +2,7 @@ project(caf_tools CXX)
add_custom_target(all_tools) add_custom_target(all_tools)
include_directories(${LIBCAF_INCLUDE_DIRS}) include_directories(${CAF_INCLUDE_DIRS})
macro(add name) macro(add name)
add_executable(${name} ${name}.cpp ${ARGN}) add_executable(${name} ${name}.cpp ${ARGN})
......
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