Commit bc703b3e authored by Mark OLESEN's avatar Mark OLESEN
Browse files

COMP: better handling of versioned cmake libraries

- sentinel was not working properly when building user-space routines
parent be0cc59a
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Optional unit: continue-on-error
export WM_CONTINUE_ON_ERROR=true
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
# Source CMake functions
. $WM_PROJECT_DIR/wmake/scripts/cmakeFunctions
cd ${0%/*} || exit 1 # Run from this directory
export WM_CONTINUE_ON_ERROR=true # Optional unit
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments # Parse arguments
. $WM_PROJECT_DIR/wmake/scripts/cmakeFunctions # The CMake functions
# -----------------------------------------------------------------------------
......
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source CMake functions
. $WM_PROJECT_DIR/wmake/scripts/cmakeFunctions
cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/wmake/scripts/cmakeFunctions # The CMake functions
# -----------------------------------------------------------------------------
......@@ -23,7 +21,7 @@ if [ -n "$depend" ]
then
if [ "$targetType" != objects ]
then
if type cmake > /dev/null 2>&1
if command -v cmake > /dev/null 2>&1
then
cmakeVersioned "$depend" $PWD || {
echo
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment