Skip to content

Use subprojects instead #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rogerhu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use subprojects instead #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a013791
Use subprojects instead
May 29, 2019
fbadd34
Update to CMake 3.5 min
May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)

project (LibEBC)

Expand Down
6 changes: 4 additions & 2 deletions lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
project(lib)

include(CheckLibraryExists)

# LibXml2 Dependency
Expand Down Expand Up @@ -41,8 +43,8 @@ endif()

# Configure header
configure_file (
"${PROJECT_SOURCE_DIR}/lib/include/ebc/Config.h.in"
"${PROJECT_BINARY_DIR}/ebc/Config.h")
"${lib_SOURCE_DIR}/include/ebc/Config.h.in"
"${lib_BINARY_DIR}/ebc/Config.h")

# UUID
if(UNIX AND NOT APPLE)
Expand Down
2 changes: 2 additions & 0 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
project (test)

# LibXml2 Dependency
find_package(LibXml2 REQUIRED)
include_directories(${LIBXML2_INCLUDE_DIR})
Expand Down
7 changes: 4 additions & 3 deletions tool/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
project (tool)
add_subdirectory(vendor)

# Configure
configure_file (
"${PROJECT_SOURCE_DIR}/tool/ebcutil.cpp"
"${PROJECT_BINARY_DIR}/tool/ebcutil.cpp")
"${tool_SOURCE_DIR}/ebcutil.cpp"
"${tool_BINARY_DIR}/ebcutil.cpp")

add_executable(ebcutil ${PROJECT_BINARY_DIR}/tool/ebcutil.cpp)
add_executable(ebcutil ${tool_BINARY_DIR}/ebcutil.cpp)
target_link_libraries(ebcutil ebc tclap rang)

set_property(TARGET ebcutil PROPERTY CXX_STANDARD 14)