Commit a1771c76c35de5e12ef0fcd52a779a9867bfbf8a | zig

author	Andrew Kelley <andrew@ziglang.org> 2015-11-25 11:23:25-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2015-11-25 11:23:25-07:00
log	a1771c76c35de5e12ef0fcd52a779a9867bfbf8a
tree	96f65adf0d1ca1003a734f63db137904d6b1b754
parent	4fe366dfa6e58d7e0c159a5e864fec56499cc888

3 files changed, 24 insertions(+), 7 deletions(-)

CMakeLists.txt+2-1

...	...	@@ -13,7 +13,8 @@ set(ZIG_VERSION "${ZIG_VERSION_MAJOR}.${ZIG_VERSION_MINOR}.${ZIG_VERSION_PATCH}"
13	13	message("Configuring zig version ${ZIG_VERSION}")
14	14
15	15	find_package(llvm)
16		include_directories(${LLVM_INCLUDE_DIR})
	16	include_directories(${LLVM_INCLUDE_DIRS})
	17	link_directories(${LLVM_LIBDIRS})
17	18
18	19	include_directories(
19	20	${CMAKE_SOURCE_DIR}

README.md+1-1

...	...	@@ -31,8 +31,8 @@ readable, safe, optimal, and concise code to solve any computing problem.
31	31
32	32	## Roadmap
33	33
34		* C style comments.
35	34	* Unit tests.
	35	* C style comments.
36	36	* Simple .so library
37	37	* Multiple files
38	38	* figure out integers

cmake/Findllvm.cmake+21-5

...	...	@@ -3,19 +3,35 @@
3	3	# See http://opensource.org/licenses/MIT
4	4
5	5	# LLVM_FOUND
6		# LLVM_INCLUDE_DIR
	6	# LLVM_INCLUDE_DIRS
7	7	# LLVM_LIBRARIES
	8	# LLVM_LIBDIRS
8	9
9		find_path(LLVM_INCLUDE_DIR NAMES llvm-c/Core.h)
	10	find_path(LLVM_C_INCLUDE_DIR NAMES llvm-c/Core.h PATHS /usr/include/llvm-c-3.7/)
	11	find_path(LLVM_INCLUDE_DIR NAMES llvm/IR/IRBuilder.h PATHS /usr/include/llvm-3.7/)
10	12
11		find_program(LLVM_CONFIG_EXE llvm-config)
	13	find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-3.7)
12	14
13	15	execute_process(
14	16	COMMAND ${LLVM_CONFIG_EXE} --libs
15	17	OUTPUT_VARIABLE LLVM_LIBRARIES
16	18	OUTPUT_STRIP_TRAILING_WHITESPACE)
17	19
	20	execute_process(
	21	COMMAND ${LLVM_CONFIG_EXE} --system-libs
	22	OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
	23	OUTPUT_STRIP_TRAILING_WHITESPACE)
	24
	25	execute_process(
	26	COMMAND ${LLVM_CONFIG_EXE} --libdir
	27	OUTPUT_VARIABLE LLVM_LIBDIRS
	28	OUTPUT_STRIP_TRAILING_WHITESPACE)
	29
	30	set(LLVM_INCLUDE_DIRS "${LLVM_C_INCLUDE_DIR} ${LLVM_INCLUDE_DIR}")
	31	set(LLVM_LIBRARIES "${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS}")
	32
	33
18	34	include(FindPackageHandleStandardArgs)
19		find_package_handle_standard_args(LLVM DEFAULT_MSG LLVM_LIBRARIES LLVM_INCLUDE_DIR)
	35	find_package_handle_standard_args(LLVM DEFAULT_MSG LLVM_LIBRARIES LLVM_INCLUDE_DIRS)
20	36
21		mark_as_advanced(LLVM_INCLUDE_DIR LLVM_LIBRARIES)
	37	mark_as_advanced(LLVM_INCLUDE_DIRS LLVM_LIBRARIES LLVM_LIBDIRS)