Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
iMSTK
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
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
Ruiliang Gao
iMSTK
Commits
903037e3
Commit
903037e3
authored
9 years ago
by
Ricardo Ortiz
Browse files
Options
Downloads
Patches
Plain Diff
Change VegaFEM and Glew dependencies to point to the gitlab repo.
parent
3b8c8840
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
CMake/SuperBuild/External_GLEW.cmake
+1
-1
1 addition, 1 deletion
CMake/SuperBuild/External_GLEW.cmake
CMake/SuperBuild/External_GLUT.cmake
+0
-96
0 additions, 96 deletions
CMake/SuperBuild/External_GLUT.cmake
CMake/SuperBuild/External_VegaFEM.cmake
+1
-1
1 addition, 1 deletion
CMake/SuperBuild/External_VegaFEM.cmake
with
2 additions
and
98 deletions
CMake/SuperBuild/External_GLEW.cmake
+
1
−
1
View file @
903037e3
...
...
@@ -21,7 +21,7 @@
#
set
(
GLEW_TAG
"e1f9e4702fe7cf9f5babb50c21fcf5a4860f2844"
)
set
(
GLEW_REPOSITORY git@
b
it
bucket.org:s
im
m
ed
tk/g
lew.git
)
set
(
GLEW_REPOSITORY git@
g
it
lab.kitware.com:S
im
M
ed
TK/G
lew.git
)
# Make sure this file is included only once
get_filename_component
(
CMAKE_CURRENT_LIST_FILENAME
${
CMAKE_CURRENT_LIST_FILE
}
NAME_WE
)
...
...
This diff is collapsed.
Click to expand it.
CMake/SuperBuild/External_GLUT.cmake
deleted
100644 → 0
+
0
−
96
View file @
3b8c8840
###########################################################################
#
# Copyright (c) Center for Modeling, Simulation, and Imaging in Medicine,
# Rensselaer Polytechnic Institute
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0.txt
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
###########################################################################
#
# GLUT
#
set
(
GLUT_TAG
"f4cd139604ebdf63dd3ec2f4b40886bf2cd05294"
)
set
(
GLUT_REPOSITORY git@bitbucket.org:simmedtk/freeglut.git
)
# Make sure this file is included only once
get_filename_component
(
CMAKE_CURRENT_LIST_FILENAME
${
CMAKE_CURRENT_LIST_FILE
}
NAME_WE
)
if
(
${
CMAKE_CURRENT_LIST_FILENAME
}
_FILE_INCLUDED
)
return
()
endif
()
set
(
${
CMAKE_CURRENT_LIST_FILENAME
}
_FILE_INCLUDED 1
)
# Sanity checks
if
(
DEFINED GLUT_DIR AND NOT EXISTS
${
GLUT_DIR
}
)
message
(
FATAL_ERROR
"GLUT_DIR variable is defined but corresponds to non-existing directory"
)
endif
()
set
(
GLUT_DEPENDENCIES
""
)
# Include dependent projects if any
SimMedTKCheckDependencies
(
GLUT
)
set
(
proj GLUT
)
if
(
NOT DEFINED
${
proj
}
_DIR
)
# Set CMake OSX and Windows variables to pass down the external project
set
(
CMAKE_OSX_EXTERNAL_PROJECT_ARGS
)
set
(
CMAKE_MSVC_EXTERNAL_PROJECT_ARGS
)
if
(
APPLE
)
list
(
APPEND CMAKE_OSX_EXTERNAL_PROJECT_ARGS
-DCMAKE_OSX_ARCHITECTURES=
${
CMAKE_OSX_ARCHITECTURES
}
-DCMAKE_OSX_SYSROOT=
${
CMAKE_OSX_SYSROOT
}
-DCMAKE_OSX_DEPLOYMENT_TARGET=
${
CMAKE_OSX_DEPLOYMENT_TARGET
}
)
endif
()
if
(
MSVC
)
list
(
APPEND CMAKE_MSVC_EXTERNAL_PROJECT_ARGS
-DINSTALL_PDB:BOOL=OFF
)
endif
()
# message(STATUS "Adding project:${proj}")
ExternalProject_Add
(
${
proj
}
SOURCE_DIR
${
CMAKE_BINARY_DIR
}
/SuperBuild/
${
proj
}
BINARY_DIR
${
CMAKE_BINARY_DIR
}
/SuperBuild/
${
proj
}
-build
PREFIX
${
CMAKE_BINARY_DIR
}
/SuperBuild/
${
proj
}${
ep_suffix
}
GIT_REPOSITORY
${${
proj
}
_REPOSITORY
}
GIT_TAG
${${
proj
}
_TAG
}
UPDATE_COMMAND
""
INSTALL_COMMAND
""
CMAKE_GENERATOR
${
gen
}
CONFIGURE_COMMAND
${
CMAKE_COMMAND
}
${
CMAKE_BINARY_DIR
}
/SuperBuild/
${
proj
}
/freeglut/freeglut
-DCMAKE_BUILD_TYPE:STRING=
${
CMAKE_BUILD_TYPE
}
-DCMAKE_CXX_FLAGS:STRING=
${
ep_common_cxx_flags
}
-DCMAKE_C_FLAGS:STRING=
${
ep_common_c_flags
}
-DCMAKE_INSTALL_PREFIX:PATH=
${
ep_install_dir
}
-DBUILD_SHARED_LIBS:BOOL=
${
SimMedTK_BUILD_SHARED_LIBS
}
-DFREEGLUT_BUILD_DEMOS:BOOL=OFF
${
CMAKE_OSX_EXTERNAL_PROJECT_ARGS
}
${
CMAKE_MSVC_EXTERNAL_PROJECT_ARGS
}
${
OUTPUT_DIRECTORIES
}
DEPENDS
${${
proj
}
_DEPENDENCIES
}
LOG_DOWNLOAD 1
# Wrap download in script to log output
LOG_UPDATE 1
# Wrap update in script to log output
# LOG_CONFIGURE 1 # Wrap configure in script to log output
# LOG_BUILD 1 # Wrap build in script to log output
LOG_TEST 1
# Wrap test in script to log output
LOG_INSTALL 1
# Wrap install in script to log output
)
set
(
${
proj
}
_DIR
${
ep_install_dir
}
/
)
else
()
SimMedTKEmptyExternalProject
(
${
proj
}
"
${${
proj
}
_DEPENDENCIES
}
"
)
endif
()
set
(
SimMedTK_CMAKE_INCLUDE_PATH
${
CMAKE_BINARY_DIR
}
/SuperBuild/
${
proj
}
/freeglut/freeglut/include/
${
sep
}${
SimMedTK_CMAKE_INCLUDE_PATH
}
)
This diff is collapsed.
Click to expand it.
CMake/SuperBuild/External_VegaFEM.cmake
+
1
−
1
View file @
903037e3
...
...
@@ -20,7 +20,7 @@
# VegaFEM
#
set
(
VegaFEM_TAG
"6bba4eadbd943c003fcf90fcec122a3b3feef30d"
)
set
(
VegaFEM_REPOSITORY git@
b
it
bucket.org:s
im
m
ed
tk/vegafem-cm
ake.git
)
set
(
VegaFEM_REPOSITORY git@
g
it
lab.kitware.com:S
im
M
ed
TK/VegaFEM-CM
ake.git
)
# Make sure this file is included only once
get_filename_component
(
CMAKE_CURRENT_LIST_FILENAME
${
CMAKE_CURRENT_LIST_FILE
}
NAME_WE
)
...
...
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