Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
ec5a7675
Commit
ec5a7675
authored
Mar 13, 2014
by
Marco Serantoni
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[MacOSX] New OSX enviroment seems to be more picky about options, this fixes the linker part
parent
e76c330a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
CMakeLists.txt
CMakeLists.txt
+3
-2
No files found.
CMakeLists.txt
View file @
ec5a7675
...
@@ -199,11 +199,12 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
...
@@ -199,11 +199,12 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
if
(
NOT APPLE
)
if
(
NOT APPLE
)
set
(
CMAKE_SHARED_LINKER_FLAGS
"
${
TO_LINKER
}
,--no-undefined"
)
set
(
CMAKE_SHARED_LINKER_FLAGS
"
${
TO_LINKER
}
,--no-undefined"
)
set
(
CMAKE_MODULE_LINKER_FLAGS
"
${
TO_LINKER
}
,--no-undefined"
)
set
(
CMAKE_MODULE_LINKER_FLAGS
"
${
TO_LINKER
}
,--no-undefined"
)
endif
()
set
(
CMAKE_EXE_LINKER_FLAGS_RELEASE
"-s"
)
set
(
CMAKE_EXE_LINKER_FLAGS_RELEASE
"-s"
)
endif
()
endif
()
endif
()
# quiet GCC while in boost
# quiet GCC while in boost
if
(
GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8
)
if
(
GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-unused-local-typedefs"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-unused-local-typedefs"
)
...
@@ -215,7 +216,7 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
...
@@ -215,7 +216,7 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-D__ASSERTMACROS__ -mmacosx-version-min=10.5"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-D__ASSERTMACROS__ -mmacosx-version-min=10.5"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-D__ASSERTMACROS__ -mmacosx-version-min=10.5"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-D__ASSERTMACROS__ -mmacosx-version-min=10.5"
)
# Allows .dylib relocation in the future
# Allows .dylib relocation in the future
- needed by fixbundle
set
(
CMAKE_LD_FLAGS
"
${
CMAKE_LD_FLAGS
}
-headerpad_max_install_names"
)
set
(
CMAKE_LD_FLAGS
"
${
CMAKE_LD_FLAGS
}
-headerpad_max_install_names"
)
if
(
NOT CMAKE_CXX_COMPILER
)
if
(
NOT CMAKE_CXX_COMPILER
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment