Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CMake
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
André Pedro
CMake
Commits
98e51196
Commit
98e51196
authored
19 years ago
by
Brad King
Browse files
Options
Downloads
Patches
Plain Diff
BUG: Install rule should take build configuration into account.
parent
c69c9e01
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
Tests/SimpleInstall/CMakeLists.txt
+13
-1
13 additions, 1 deletion
Tests/SimpleInstall/CMakeLists.txt
Tests/SimpleInstallS2/CMakeLists.txt
+13
-1
13 additions, 1 deletion
Tests/SimpleInstallS2/CMakeLists.txt
with
26 additions
and
2 deletions
Tests/SimpleInstall/CMakeLists.txt
+
13
−
1
View file @
98e51196
...
@@ -23,6 +23,11 @@ IF(STAGE2)
...
@@ -23,6 +23,11 @@ IF(STAGE2)
SET
(
LIBPATHS
${
LIBPATHS
}
"
${
CMAKE_INSTALL_PREFIX
}
/bin"
)
SET
(
LIBPATHS
${
LIBPATHS
}
"
${
CMAKE_INSTALL_PREFIX
}
/bin"
)
ENDIF
(
CYGWIN OR MINGW
)
ENDIF
(
CYGWIN OR MINGW
)
MESSAGE
(
"Search for library in:
${
LIBPATHS
}
"
)
MESSAGE
(
"Search for library in:
${
LIBPATHS
}
"
)
SET
(
TEST1_LIBRARY
"TEST1_LIBRARY-NOTFOUND"
CACHE FILEPATH
"Force find."
FORCE
)
SET
(
TEST2_LIBRARY
"TEST2_LIBRARY-NOTFOUND"
CACHE FILEPATH
"Force find."
FORCE
)
SET
(
TEST4_LIBRARY
"TEST4_LIBRARY-NOTFOUND"
CACHE FILEPATH
"Force find."
FORCE
)
FIND_LIBRARY
(
TEST1_LIBRARY
FIND_LIBRARY
(
TEST1_LIBRARY
NAMES
${
t1NAMES
}
NAMES
${
t1NAMES
}
PATHS
${
LIBPATHS
}
PATHS
${
LIBPATHS
}
...
@@ -75,11 +80,18 @@ ELSE(STAGE2)
...
@@ -75,11 +80,18 @@ ELSE(STAGE2)
SET_TARGET_PROPERTIES
(
test4 PROPERTIES VERSION 1.2 SOVERSION 3
)
SET_TARGET_PROPERTIES
(
test4 PROPERTIES VERSION 1.2 SOVERSION 3
)
ENDIF
(
STAGE2
)
ENDIF
(
STAGE2
)
IF
(
CMAKE_CONFIGURATION_TYPES
)
SET
(
SI_CONFIG -C
${
CMAKE_CFG_INTDIR
}
)
ELSE
(
CMAKE_CONFIGURATION_TYPES
)
SET
(
SI_CONFIG
)
ENDIF
(
CMAKE_CONFIGURATION_TYPES
)
ADD_CUSTOM_COMMAND
(
ADD_CUSTOM_COMMAND
(
TARGET
${
install_target
}
TARGET
${
install_target
}
POST_BUILD
POST_BUILD
COMMAND
${
CMAKE_CTEST_COMMAND
}
COMMAND
${
CMAKE_CTEST_COMMAND
}
ARGS --build-and-test
ARGS
${
SI_CONFIG
}
--build-and-test
${
CMAKE_SOURCE_DIR
}
${
CMAKE_SOURCE_DIR
}
${
CMAKE_BINARY_DIR
}
${
CMAKE_BINARY_DIR
}
--build-generator
${
CMAKE_GENERATOR
}
--build-generator
${
CMAKE_GENERATOR
}
...
...
This diff is collapsed.
Click to expand it.
Tests/SimpleInstallS2/CMakeLists.txt
+
13
−
1
View file @
98e51196
...
@@ -23,6 +23,11 @@ IF(STAGE2)
...
@@ -23,6 +23,11 @@ IF(STAGE2)
SET
(
LIBPATHS
${
LIBPATHS
}
"
${
CMAKE_INSTALL_PREFIX
}
/bin"
)
SET
(
LIBPATHS
${
LIBPATHS
}
"
${
CMAKE_INSTALL_PREFIX
}
/bin"
)
ENDIF
(
CYGWIN OR MINGW
)
ENDIF
(
CYGWIN OR MINGW
)
MESSAGE
(
"Search for library in:
${
LIBPATHS
}
"
)
MESSAGE
(
"Search for library in:
${
LIBPATHS
}
"
)
SET
(
TEST1_LIBRARY
"TEST1_LIBRARY-NOTFOUND"
CACHE FILEPATH
"Force find."
FORCE
)
SET
(
TEST2_LIBRARY
"TEST2_LIBRARY-NOTFOUND"
CACHE FILEPATH
"Force find."
FORCE
)
SET
(
TEST4_LIBRARY
"TEST4_LIBRARY-NOTFOUND"
CACHE FILEPATH
"Force find."
FORCE
)
FIND_LIBRARY
(
TEST1_LIBRARY
FIND_LIBRARY
(
TEST1_LIBRARY
NAMES
${
t1NAMES
}
NAMES
${
t1NAMES
}
PATHS
${
LIBPATHS
}
PATHS
${
LIBPATHS
}
...
@@ -75,11 +80,18 @@ ELSE(STAGE2)
...
@@ -75,11 +80,18 @@ ELSE(STAGE2)
SET_TARGET_PROPERTIES
(
test4 PROPERTIES VERSION 1.2 SOVERSION 3
)
SET_TARGET_PROPERTIES
(
test4 PROPERTIES VERSION 1.2 SOVERSION 3
)
ENDIF
(
STAGE2
)
ENDIF
(
STAGE2
)
IF
(
CMAKE_CONFIGURATION_TYPES
)
SET
(
SI_CONFIG -C
${
CMAKE_CFG_INTDIR
}
)
ELSE
(
CMAKE_CONFIGURATION_TYPES
)
SET
(
SI_CONFIG
)
ENDIF
(
CMAKE_CONFIGURATION_TYPES
)
ADD_CUSTOM_COMMAND
(
ADD_CUSTOM_COMMAND
(
TARGET
${
install_target
}
TARGET
${
install_target
}
POST_BUILD
POST_BUILD
COMMAND
${
CMAKE_CTEST_COMMAND
}
COMMAND
${
CMAKE_CTEST_COMMAND
}
ARGS --build-and-test
ARGS
${
SI_CONFIG
}
--build-and-test
${
CMAKE_SOURCE_DIR
}
${
CMAKE_SOURCE_DIR
}
${
CMAKE_BINARY_DIR
}
${
CMAKE_BINARY_DIR
}
--build-generator
${
CMAKE_GENERATOR
}
--build-generator
${
CMAKE_GENERATOR
}
...
...
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