summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSebastian Graf <sebastian.graf@kit.edu>2018-11-16 22:10:58 +0100
committerSebastian Graf <sebastian.graf@kit.edu>2018-11-16 22:11:05 +0100
commitbedf49a1c8b0ee639d66c503f48a52b8e4eafca8 (patch)
treef3ce33988724bdeed8889b24999c09fe51b3e680
parent9fc505847f46d609a222cea96e35a2e5e1037db8 (diff)
cmake: Bump libfirm and add it as a subdirectory
-rw-r--r--CMakeLists.txt8
m---------libfirm0
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 605840a..3bc0090 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,12 +62,12 @@ set(SOURCES
)
include_directories(src)
-# Need libfirm of the same version as cparser
-find_package(libfirm ${cparser_VERSION} REQUIRED)
-include_directories(${libfirm_INCLUDE_DIRS})
+add_subdirectory(libfirm)
+# Also include generated header files which are dropped into firm's BINARY_DIR.
+include_directories(libfirm/include ${libfirm_BINARY_DIR}/include)
add_executable(cparser ${SOURCES})
-target_link_libraries(cparser libfirm::firm)
+target_link_libraries(cparser firm)
if(UNIX)
target_link_libraries(cparser m)
endif()
diff --git a/libfirm b/libfirm
-Subproject 137232fc4070ecc828cb448b11bad355bcb10f9
+Subproject a30acf9ee5b65ea032f1b896377661733d8a610