Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Sébastien Peillet
otb
Commits
cb998e68
Commit
cb998e68
authored
7 years ago
by
Rashad Kanavath
Browse files
Options
Downloads
Patches
Plain Diff
BUG: use cmake --build rather than make (xplatform)
parent
51e73cb3
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Packaging/Files/build_examples.cmake
+6
-8
6 additions, 8 deletions
Packaging/Files/build_examples.cmake
Packaging/testing.cmake
+0
-1
0 additions, 1 deletion
Packaging/testing.cmake
with
6 additions
and
9 deletions
Packaging/Files/build_examples.cmake
+
6
−
8
View file @
cb998e68
...
...
@@ -2,12 +2,7 @@ if(NOT SRC_DIR)
message
(
FATAL_ERROR
"SRC_DIR is not set"
)
endif
()
if
(
NOT MAKE_PROGRAM
)
message
(
FATAL_ERROR
"MAKE_PROGRAM is not set"
)
endif
()
set
(
PKG_DIR
)
get_filename_component
(
PKG_DIR
${
CMAKE_CURRENT_LIST_DIR
}
PATH
)
set
(
TEST_DIR
${
PKG_DIR
}
/ex_build
)
...
...
@@ -20,7 +15,6 @@ endif()
message
(
"TEST_DIR=
${
TEST_DIR
}
"
)
message
(
"PKG_DIR=
${
PKG_DIR
}
"
)
message
(
"SRC_DIR=
${
SRC_DIR
}
"
)
message
(
"MAKE_PROGRAM=
${
MAKE_PROGRAM
}
"
)
# if( "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
# find_program(GREP grep)
...
...
@@ -58,7 +52,9 @@ endif()
# If you want to test building a third targert, use foreach.
# the code is written in a way that it is easy to stuff these two
# into a cmake foreach
execute_process
(
COMMAND
${
MAKE_PROGRAM
}
HelloWorldOTB
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
--build
${
TEST_DIR
}
--target HelloWorldOTB
WORKING_DIRECTORY
${
TEST_DIR
}
RESULT_VARIABLE build_HelloWorldOTB_rv
OUTPUT_VARIABLE build_HelloWorldOTB_ov
...
...
@@ -72,7 +68,9 @@ else()
message
(
"Build PASSED. build_HelloWorldOTB_ov:
\n
${
build_HelloWorldOTB_ov
}
"
)
endif
()
execute_process
(
COMMAND
${
MAKE_PROGRAM
}
Pipeline
execute_process
(
COMMAND
${
CMAKE_COMMAND
}
--build
${
TEST_DIR
}
--target Pipeline
WORKING_DIRECTORY
${
TEST_DIR
}
RESULT_VARIABLE build_Pipeline_rv
OUTPUT_VARIABLE build_Pipeline_ov
...
...
This diff is collapsed.
Click to expand it.
Packaging/testing.cmake
+
0
−
1
View file @
cb998e68
...
...
@@ -46,7 +46,6 @@ add_test(
NAME Tu_build_examples
COMMAND
${
CMAKE_COMMAND
}
-DSRC_DIR=
${
CMAKE_SOURCE_DIR
}
/../Examples
-DMAKE_PROGRAM=
${
CMAKE_MAKE_PROGRAM
}
-P
${
pkg_extracted_dir
}
/tools/build_examples.cmake
WORKING_DIRECTORY
${
testing_dir
}
)
...
...
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