Skip to content

Commit 163d0a8

Browse files
committed
CDRIVER-2505 fix macos travis
1 parent bb669da commit 163d0a8

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,6 @@ set (ZLIB_SOURCES
187187
${SOURCE_DIR}/src/zlib-1.2.11/gzwrite.c
188188
)
189189

190-
if (ENABLE_MONGOC STREQUAL ON)
191-
add_subdirectory (src/libmongoc)
192-
endif ()
193-
194190
set (CPACK_RESOURCE_FILE_LICENSE "${SOURCE_DIR}/COPYING")
195191

196192
include (CPack)
@@ -227,6 +223,9 @@ if (APPLE)
227223
add_definitions (-Wno-deprecated-declarations)
228224
endif ()
229225

226+
if (ENABLE_MONGOC STREQUAL ON)
227+
add_subdirectory (src/libmongoc)
228+
endif ()
230229

231230
if (ENABLE_MAN_PAGES STREQUAL ON OR ENABLE_HTML_DOCS STREQUAL ON)
232231
find_package (Sphinx REQUIRED)

src/libmongoc/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,6 @@ set (MONGOC_API_VERSION 1.0)
301301
set (CPACK_PACKAGE_VERSION_MAJOR ${MONGOC_MAJOR_VERSION})
302302
set (CPACK_PACKAGE_VERSION_MINOR ${MONGOC_MINOR_VERSION})
303303

304-
include (CPack)
305-
306304
set (MONGOC_CC ${CMAKE_C_COMPILER})
307305
set (MONGOC_USER_SET_CFLAGS ${CMAKE_C_FLAGS})
308306
set (MONGOC_USER_SET_LDFLAGS ${CMAKE_EXE_LINKER_FLAGS})

0 commit comments

Comments
 (0)