diff options
| author | Vicent Marti <tanoku@gmail.com> | 2013-01-02 04:17:31 +0100 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2013-01-02 04:19:13 +0100 |
| commit | 5c2d3f6d5deeec84c7cadc7d9f61b00952f1d56f (patch) | |
| tree | 83c38f4a5001325fc962a4475afe35f7f1d74bd3 | |
| parent | b0a45829750825bdc417b0c3e5947c762faebbe0 (diff) | |
| download | libgit2-5c2d3f6d5deeec84c7cadc7d9f61b00952f1d56f.tar.gz | |
Add build dependency for clar. Also, fuck you CMake. Fuck you.
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| m--------- | tests-clar/clar | 0 |
2 files changed, 9 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 69768443f..f2cf252d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -242,17 +242,23 @@ IF (BUILD_CLAR) ADD_DEFINITIONS(-DCLAR_RESOURCES=\"${TEST_RESOURCES}\") INCLUDE_DIRECTORIES(${CLAR_PATH}) - FILE(GLOB_RECURSE SRC_TEST ${CLAR_PATH}/*/*.c ${CLAR_PATH}/clar_helpers.c) + FILE(GLOB_RECURSE SRC_TEST ${CLAR_PATH}/*/*.c) + SET(SRC_CLAR "${CLAR_PATH}/main.c" "${CLAR_PATH}/clar_helpers.c") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-prototypes") ADD_CUSTOM_COMMAND( OUTPUT ${CLAR_PATH}/clar.suite COMMAND ${PYTHON_EXECUTABLE} clar/generate.py . - DEPENDS ${CLAR_PATH}/clar.suite ${SRC_TEST} + DEPENDS ${SRC_TEST} WORKING_DIRECTORY ${CLAR_PATH} ) - ADD_EXECUTABLE(libgit2_clar ${SRC_GIT2} ${SRC_OS} ${CLAR_PATH}/main.c ${SRC_TEST} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SHA1}) + SET_SOURCE_FILES_PROPERTIES( + ${CLAR_PATH}/clar/clar.c + PROPERTIES OBJECT_DEPENDS ${CLAR_PATH}/clar.suite) + + ADD_EXECUTABLE(libgit2_clar ${SRC_GIT2} ${SRC_OS} ${SRC_CLAR} ${SRC_TEST} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SHA1}) + TARGET_LINK_LIBRARIES(libgit2_clar ${SSL_LIBRARIES}) TARGET_OS_LIBRARIES(libgit2_clar) MSVC_SPLIT_SOURCES(libgit2_clar) diff --git a/tests-clar/clar b/tests-clar/clar -Subproject 1febaef178ccc12d3bdc4568a23f089b520a987 +Subproject fe7d9740becabac0e856eb0cdc19bc7e48680ba |