Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
chaosframework
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
chaos-lnf-control
chaosframework
Commits
993e6e03
Commit
993e6e03
authored
2 years ago
by
Andrea Michelotti
Browse files
Options
Downloads
Patches
Plain Diff
compile
parent
4776b276
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ChaosMetadataService/CMakeLists.txt
+6
-6
6 additions, 6 deletions
ChaosMetadataService/CMakeLists.txt
chaos/common/CMakeLists.txt
+1
-1
1 addition, 1 deletion
chaos/common/CMakeLists.txt
config/CMakeChaos.txt
+2
-2
2 additions, 2 deletions
config/CMakeChaos.txt
with
9 additions
and
9 deletions
ChaosMetadataService/CMakeLists.txt
+
6
−
6
View file @
993e6e03
cmake_minimum_required
(
VERSION
2.9
)
cmake_minimum_required
(
VERSION
3.7
)
project
(
ChaosMetadataService
)
#add module path for permi to find lirary
...
...
@@ -144,10 +144,10 @@ ExternalProject_Add(
PREFIX
"
${
CMAKE_BINARY_DIR
}
/ext_dep/couchbase-c-driver-prefix"
SOURCE_DIR
"
${
CMAKE_BINARY_DIR
}
/ext_dep/couchbase-c-driver-src"
BINARY_DIR
"
${
CMAKE_BINARY_DIR
}
/ext_dep/couchbase-c-driver-build"
INSTALL_COMMAND cp
${
CMAKE_BINARY_DIR
}
/ext_dep/couchbase-c-driver-build/lib/libcouchbase
S.a
${
CMAKE_INSTALL_PREFIX
}
/lib
INSTALL_COMMAND cp
${
CMAKE_BINARY_DIR
}
/ext_dep/couchbase-c-driver-build/lib/libcouchbase
.so
${
CMAKE_INSTALL_PREFIX
}
/lib
# BUILD_COMMAND make CFLAGS=${CMAKE_C_FLAGS} CXXFLAGS=${CMAKE_CXX_FLAGS} install
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=
${
CMAKE_INSTALL_PREFIX
}
-DLCB_INSTALL_HEADERS=ON -DCMAKE_BUILD_TYPE=Release -DLCB_NO_TESTS=ON
-DLCB_NO_PLUGINS=ON
-DLCB_NO_MOCK=ON -DLCB_NO_SSL=ON
-DCMAKE_INSTALL_PREFIX:PATH=
${
CMAKE_INSTALL_PREFIX
}
-DLCB_INSTALL_HEADERS=ON
-DLCB_NO_PLUGINS=ON
-DCMAKE_BUILD_TYPE=Release -DLCB_NO_TESTS=ON -DLCB_NO_MOCK=ON -DLCB_NO_SSL=ON
LOG_DOWNLOAD ON
LOG_CONFIGURE ON
LOG_BUILD ON
)
...
...
@@ -465,7 +465,7 @@ ENDIF(CHAOS_PROMETHEUS)
IF
(
BUILD_FORCE_STATIC
)
ADD_LIBRARY
(
chaos_cds STATIC
${
cnd_src
}
${
api_src
}
${
service_src
}
${
posix_src
}
)
TARGET_LINK_LIBRARIES
(
chaos_cds chaos_common couchbase mongoclient mongocxx bsoncxx
)
TARGET_LINK_LIBRARIES
(
chaos_cds
PRIVATE
chaos_common couchbase
S.a
mongoclient mongocxx bsoncxx
)
ELSE
(
BUILD_FORCE_STATIC
)
ADD_LIBRARY
(
chaos_cds SHARED
${
posix_src
}
${
service_src
}
${
api_src
}
${
cnd_src
}
)
#
# set_target_properties(chaos_cds PROPERTIES VERSION 1.0.0 SOVERSION 1)
...
...
@@ -516,9 +516,9 @@ target_compile_definitions(chaos_cds PRIVATE USE_MONGODB3_DRIVER=1)
# SET(BUILD_LIBRARY ${BUILD_LIBRARY} uv)
# SET(BUILD_LIBRARY ${BUILD_LIBRARY} cassandra)
# target_compile_definitions(${PROJECT_NAME} PRIVATE USE_CASSANDRA_DRIVER=1)
TARGET_LINK_LIBRARIES
(
chaos_cds
${
BUILD_LIBRARY
}
)
TARGET_LINK_LIBRARIES
(
chaos_cds
PUBLIC
${
BUILD_LIBRARY
}
PRIVATE jsoncpp.a
)
TARGET_LINK_LIBRARIES
(
${
PROJECT_NAME
}
chaos_cds
${
BUILD_LIBRARY
}
)
TARGET_LINK_LIBRARIES
(
${
PROJECT_NAME
}
PUBLIC
chaos_cds
${
BUILD_LIBRARY
}
)
#INSTALL_TARGETS(/bin ${PROJECT_NAME})
...
...
This diff is collapsed.
Click to expand it.
chaos/common/CMakeLists.txt
+
1
−
1
View file @
993e6e03
...
...
@@ -680,7 +680,7 @@ IF (BUILD_FORCE_STATIC )
ELSE
(
BUILD_FORCE_STATIC
)
ADD_LIBRARY
(
${
PROJECT_NAME
}
SHARED
${
common_lib_src
}
)
set_target_properties
(
${
PROJECT_NAME
}
PROPERTIES VERSION 1.0.0 SOVERSION 1
)
TARGET_LINK_LIBRARIES
(
${
PROJECT_NAME
}
PUBLIC z lz4
${
EPICS_LIB
}
${
FrameworkLib
}
PRIVATE
${
BUILD_LIBRARY
}
)
TARGET_LINK_LIBRARIES
(
${
PROJECT_NAME
}
PUBLIC z lz4
${
EPICS_LIB
}
${
FrameworkLib
}
PRIVATE
${
BUILD_LIBRARY
}
jsoncpp.a
)
ENDIF
(
BUILD_FORCE_STATIC
)
target_compile_definitions
(
${
PROJECT_NAME
}
PRIVATE CLING_VIRTUAL_MACHINE=
${
CLING_VIRTUAL_MACHINE
}
)
...
...
This diff is collapsed.
Click to expand it.
config/CMakeChaos.txt
+
2
−
2
View file @
993e6e03
...
...
@@ -185,7 +185,7 @@ set(Boost_USE_STATIC_RUNTIME ON)
IF(${SYSTEM_NAME} MATCHES "Darwin")
# Mac OS X specific code
MESG("enabling MAC compilation")
SET(FrameworkLib boost_program_options boost_date_time boost_system boost_chrono boost_log_setup boost_log boost_filesystem boost_thread boost_atomic boost_random
jsoncpp
pthread dl ${GCC_COVERAGE_LINK_LIB})
SET(FrameworkLib boost_program_options boost_date_time boost_system boost_chrono boost_log_setup boost_log boost_filesystem boost_thread boost_atomic boost_random pthread dl ${GCC_COVERAGE_LINK_LIB})
SET(CHAOS_BOOST_FLAGS toolset=clang)
CheckCompiler("CXX" clang++)
CheckCompiler("C" clang)
...
...
@@ -195,7 +195,7 @@ IF(${SYSTEM_NAME} MATCHES "Darwin")
ELSE()
SET(FrameworkLib boost_program_options boost_date_time boost_system boost_chrono boost_log_setup boost_log boost_filesystem boost_thread boost_atomic boost_random
jsoncpp
pthread rt dl ${GCC_COVERAGE_LINK_LIB})
SET(FrameworkLib boost_program_options boost_date_time boost_system boost_chrono boost_log_setup boost_log boost_filesystem boost_thread boost_atomic boost_random pthread rt dl ${GCC_COVERAGE_LINK_LIB})
ENDIF()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment