diff options
author | Petr Mrázek <peterix@gmail.com> | 2014-04-21 23:33:00 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2014-04-21 23:33:00 +0200 |
commit | 9d724e0fe4bfb7b7940f3f0c9719affd22a18722 (patch) | |
tree | c73e9566e134d2b78e6f1b8bce3c32159b17675f /depends/classparser/CMakeLists.txt | |
parent | a9dfe6d7ec949954b07facff71ee6023e0ced9ee (diff) | |
parent | a00fb1e8da505768b491e5f4d6266784fb1a27c9 (diff) | |
download | MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.gz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.lz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.xz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.zip |
Merge remote-tracking branch 'origin/feature_cmake_style' into develop
Conflicts:
CMakeLists.txt
Diffstat (limited to 'depends/classparser/CMakeLists.txt')
-rw-r--r-- | depends/classparser/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/depends/classparser/CMakeLists.txt b/depends/classparser/CMakeLists.txt index 5a48e002..abae3ef5 100644 --- a/depends/classparser/CMakeLists.txt +++ b/depends/classparser/CMakeLists.txt @@ -8,7 +8,7 @@ find_package(Qt5Core REQUIRED) # Include Qt headers. include_directories(${Qt5Base_INCLUDE_DIRS}) -SET(CLASSPARSER_HEADERS +set(CLASSPARSER_HEADERS include/classparser_config.h # Public headers @@ -23,13 +23,13 @@ src/javaendian.h src/membuffer.h ) -SET(CLASSPARSER_SOURCES +set(CLASSPARSER_SOURCES src/javautils.cpp src/annotations.cpp ) # Set the include dir path. -SET(LIBGROUPVIEW_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE) +set(LIBGROUPVIEW_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE) # Include self. include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) |