Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review 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
mantidproject
mantid
Commits
8cc04600
Commit
8cc04600
authored
13 years ago
by
Campbell, Stuart
Browse files
Options
Downloads
Patches
Plain Diff
Separated out the Windows and Mac OS X 3rd Party stuff. refs #4472
parent
827ca36f
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Code/Mantid/CMakeLists.txt
+38
-10
38 additions, 10 deletions
Code/Mantid/CMakeLists.txt
with
38 additions
and
10 deletions
Code/Mantid/CMakeLists.txt
+
38
−
10
View file @
8cc04600
...
...
@@ -24,16 +24,44 @@ find_package ( Qt4 COMPONENTS QtCore QtGui QtOpenGL QtXml QtSvg Qt3Support REQUI
include
(
UseSystemQt4
)
###########################################################################
# Set paths to Third_Party for Windows and Mac builds
###########################################################################
if
(
NOT THIRD_PARTY
)
set
(
THIRD_PARTY
"
${
PROJECT_SOURCE_DIR
}
/../Third_Party"
)
if
(
WIN32
)
include
(
WindowsSetup
)
elseif
(
APPLE
)
include
(
DarwinSetup
)
endif
()
endif
()
# Set paths to Third_Party for Windows builds
###########################################################################
IF
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Windows"
)
if
(
NOT THIRD_PARTY
)
set
(
THIRD_PARTY
"
${
PROJECT_SOURCE_DIR
}
/../Third_Party"
)
endif
()
# Print out were we think we are looking for 3rd party stuff
message
(
STATUS
"Setting THIRD_PARTY to be
${
THIRD_PARTY
}
."
)
# Check that the 3rd party directory exists.
if
(
NOT IS_DIRECTORY
"
${
THIRD_PARTY
}
"
)
message
(
FATAL_ERROR
"Specified THIRD_PARTY directory doesn't exist!"
)
endif
()
include
(
WindowsSetup
)
ENDIF
()
###########################################################################
# Set paths to Third_Party for Mac builds
###########################################################################
IF
(
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Darwin"
)
if
(
NOT THIRD_PARTY
)
set
(
THIRD_PARTY
"
${
PROJECT_SOURCE_DIR
}
/../Third_Party"
)
endif
()
# Print out were we think we are looking for 3rd party stuff
message
(
STATUS
"Setting THIRD_PARTY to be
${
THIRD_PARTY
}
."
)
# Check that the 3rd party directory exists.
if
(
NOT IS_DIRECTORY
"
${
THIRD_PARTY
}
"
)
message
(
FATAL_ERROR
"Specified THIRD_PARTY directory doesn't exist!"
)
endif
()
include
(
DarwinSetup
)
ENDIF
()
###########################################################################
# Call our setup script
...
...
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