Skip to content

Commit 72e0cce

Browse files
committed
Reincluded samples in default build target
1 parent f3af7b7 commit 72e0cce

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Release/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,13 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
7979

8080
# These settings can be used by the test targets
8181
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})
8385

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})
8789

8890
# Finally, the tests all use the same style declaration to build themselves, so we use a function
8991
function(add_casablanca_test NAME SOURCES_VAR)
@@ -94,8 +96,6 @@ function(add_casablanca_test NAME SOURCES_VAR)
9496
${LIB}unittestpp
9597
${LIB}httptest_utilities
9698
${LIB}common_utilities
97-
${Boost_LIBRARIES}
98-
${Boost_FRAMEWORK}
9999
${Casablanca_LIBRARIES}
100100
)
101101

@@ -108,8 +108,8 @@ endfunction()
108108

109109
add_subdirectory(src)
110110
add_subdirectory(tests)
111+
111112
# If we aren't on iOS, we can build samples.
112-
# These are also excluded from the "all" or default target
113113
if(NOT IOS)
114-
add_subdirectory(samples EXCLUDE_FROM_ALL)
114+
add_subdirectory(samples)
115115
endif()

0 commit comments

Comments
 (0)