diff options
| author | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2016-06-10 18:26:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-10 18:26:04 -0700 |
| commit | 53bc83cae788405b53ccaebbc608c8241a79b3ac (patch) | |
| tree | daf1a8d71c6552d5cad43860b1a989f51819782f | |
| parent | 937ac8116e4feac075701d80211c4cafdf673142 (diff) | |
| parent | 4469a329707c62736e84bf273d8026e19ad184d2 (diff) | |
Merge pull request #90 from jippeholwerda/master
Put CMakeLists.txt in the project root.
| -rw-r--r-- | CMakeLists.txt (renamed from scripts/CMakeLists.txt) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/CMakeLists.txt b/CMakeLists.txt index bb16870..d33750a 100644 --- a/scripts/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,8 +25,8 @@ endif() include(GNUInstallDirs) mark_as_advanced(CLEAR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR) -set(HEADERS ../src/pugixml.hpp ../src/pugiconfig.hpp) -set(SOURCES ${HEADERS} ../src/pugixml.cpp) +set(HEADERS src/pugixml.hpp src/pugiconfig.hpp) +set(SOURCES ${HEADERS} src/pugixml.cpp) if(DEFINED BUILD_DEFINES) foreach(DEFINE ${BUILD_DEFINES}) @@ -57,11 +57,11 @@ install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml) if(BUILD_TESTS) - file(GLOB TEST_SOURCES ../tests/*.cpp) - file(GLOB FUZZ_SOURCES ../tests/fuzz_*.cpp) + file(GLOB TEST_SOURCES tests/*.cpp) + file(GLOB FUZZ_SOURCES tests/fuzz_*.cpp) list(REMOVE_ITEM TEST_SOURCES ${FUZZ_SOURCES}) add_executable(check ${TEST_SOURCES}) target_link_libraries(check pugixml) - add_custom_command(TARGET check POST_BUILD COMMAND check WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/..) + add_custom_command(TARGET check POST_BUILD COMMAND check WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) endif()
\ No newline at end of file |