Merge branch 'fnordmetric2' of github.com:paulasmuth/fnordmetric-dev into fnordmetric2 (869c81bf) · Commits · github_fork / Clip

fnordmetric-core/build/cmake/CMakeLists.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -160,6 +160,7 @@ SET(XZERO_BUNDLED libxzero-0.11.0_pre20141105.tgz)
		if(XZERO_FOUND)
		link_directories(${XZERO_LIBRARY_DIRS})
		include_directories(${XZERO_INCLUDE_DIRS})
		target_link_libraries(fnord-static ${XZERO_LIBRARIES})
		else()
		set(XZERO_STAGE_DIR ${CMAKE_SOURCE_DIR}/stage/libxzero)
		execute_process(COMMAND mkdir -p ${XZERO_STAGE_DIR})
		@@ -167,8 +168,8 @@ else()
		add_subdirectory(${XZERO_STAGE_DIR})
		link_directories(${XZERO_STAGE_DIR})
		include_directories(${XZERO_STAGE_DIR}/include)
		endif()
		target_link_libraries(fnord-static xzero)
		endif()

		# fnordmetric
		add_executable(fnordmetric-cli stage/src/fnordmetric/cli.cc)