File tree Expand file tree Collapse file tree 1 file changed +8
-8
lines changed Expand file tree Collapse file tree 1 file changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -79,11 +79,13 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
79
79
80
80
# These settings can be used by the test targets
81
81
set (Casablanca_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} /include )
82
- set (Casablanca_LIBRARIES ${LIB} casablanca )
82
+ set (Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} /include ${Boost_INCLUDE_DIRS} )
83
+ set (Casablanca_LIBRARY ${LIB} casablanca )
84
+ set (Casablanca_LIBRARIES ${Casablanca_LIBRARY} ${Boost_LIBRARIES} ${Boost_FRAMEWORK} )
83
85
84
- # Everything in the project needs access to the casablanca include directory
85
- include_directories ( ${Casablanca_INCLUDE_DIR} )
86
- include_directories (${Boost_INCLUDE_DIR } )
86
+
87
+ # Everything in the project needs access to the casablanca include directories
88
+ include_directories (${Casablanca_INCLUDE_DIRS } )
87
89
88
90
# Finally, the tests all use the same style declaration to build themselves, so we use a function
89
91
function (add_casablanca_test NAME SOURCES_VAR )
@@ -94,8 +96,6 @@ function(add_casablanca_test NAME SOURCES_VAR)
94
96
${LIB} unittestpp
95
97
${LIB} httptest_utilities
96
98
${LIB} common_utilities
97
- ${Boost_LIBRARIES}
98
- ${Boost_FRAMEWORK}
99
99
${Casablanca_LIBRARIES}
100
100
)
101
101
@@ -108,8 +108,8 @@ endfunction()
108
108
109
109
add_subdirectory (src )
110
110
add_subdirectory (tests )
111
+
111
112
# If we aren't on iOS, we can build samples.
112
- # These are also excluded from the "all" or default target
113
113
if (NOT IOS )
114
- add_subdirectory (samples EXCLUDE_FROM_ALL )
114
+ add_subdirectory (samples )
115
115
endif ()
You can’t perform that action at this time.
0 commit comments