Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
acgl
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ACGL
acgl
Commits
b2522ba5
Commit
b2522ba5
authored
May 13, 2016
by
Philip Trettner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some CMake problems when HEADER or SOURCE_FILES were polluted
parent
4ff41435
Pipeline
#1802
passed with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
8 deletions
+12
-8
CMakeLists.txt
CMakeLists.txt
+11
-7
CMakeListsStaticInclude.txt
CMakeListsStaticInclude.txt
+1
-1
No files found.
CMakeLists.txt
View file @
b2522ba5
...
...
@@ -37,15 +37,19 @@ SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Release Debug Deploy)
# Project Files
################################################################################
#
# if ACGL should not get compiled as a library, just include the following file
# into the projects CMakeList.txt
#
SET
(
ACGL_SKIP_INCLUDE_AND_DEF TRUE
)
# don't use include_directories and add_definitions for modern cmake
INCLUDE
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/CMakeListsStaticInclude.txt
)
# Find all used files of certain file-types
FILE
(
GLOB_RECURSE SOURCE_FILES_C
"src/*.c"
)
FILE
(
GLOB_RECURSE SOURCE_FILES_CC
"src/*.cc"
)
FILE
(
GLOB_RECURSE SOURCE_FILES_CPP
"src/*.cpp"
)
FILE
(
GLOB_RECURSE HEADER_FILES_H
"include/*.h"
)
FILE
(
GLOB_RECURSE HEADER_FILES_HH
"include/*.hh"
)
FILE
(
GLOB_RECURSE HEADER_FILES_HPP
"include/*.hpp"
)
SET
(
ACGL_HEADER_FILES
${
HEADER_FILES_H
}
${
HEADER_FILES_HH
}
${
HEADER_FILES_HPP
}
)
SET
(
ACGL_SOURCE_FILES
${
SOURCE_FILES_C
}
${
SOURCE_FILES_CC
}
${
SOURCE_FILES_CPP
}
)
# Define the Project, add all required sources and dependencies to it
ADD_LIBRARY
(
ACGL
${
ACGL_LINK_TYPE
}
${
SOURCE_FILES
}
${
HEADER_FILES
}
)
ADD_LIBRARY
(
ACGL
${
ACGL_LINK_TYPE
}
${
ACGL_SOURCE_FILES
}
${
ACGL_
HEADER_FILES
}
)
# static linking for MSVC
IF
(
ACGL_STATIC_RUNTIME_ENV
)
...
...
CMakeListsStaticInclude.txt
View file @
b2522ba5
...
...
@@ -25,7 +25,7 @@ MACRO (RECURSE_GROUPS dirname)
ENDFOREACH()
ENDMACRO (RECURSE_GROUPS)
SET(ACGL_BASE_DIR "${CMAKE_CURRENT_
LIST
_DIR}")
SET(ACGL_BASE_DIR "${CMAKE_CURRENT_
SOURCE
_DIR}")
# Find all used files of certain file-types
FILE(GLOB_RECURSE SOURCE_FILES_C "${ACGL_BASE_DIR}/src/*.c")
FILE(GLOB_RECURSE SOURCE_FILES_CC "${ACGL_BASE_DIR}/src/*.cc")
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment