Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
52a8c077
Commit
52a8c077
authored
Dec 08, 2015
by
Sebastian Eichelbaum
Browse files
[FIX] cmake sets definitions on a per-directory basis -> hence the move into the gui dirs.
parent
130635f1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
src/CMakeLists.txt
src/CMakeLists.txt
+0
-4
src/qtgui/CMakeLists.txt
src/qtgui/CMakeLists.txt
+5
-0
src/scriptUI/CMakeLists.txt
src/scriptUI/CMakeLists.txt
+5
-0
No files found.
src/CMakeLists.txt
View file @
52a8c077
...
...
@@ -140,10 +140,6 @@ ADD_SUBDIRECTORY( core )
# Activate Boost Fix:
OPTION
(
OW_BOOST_PO_FIX
"Enable this to enable the boost::program_options linker fix."
ON
)
IF
(
OW_BOOST_PO_FIX
)
# Disable if you get errors relating to program_options::arg when linking the binary
ADD_DEFINITIONS
(
"-DOW_BOOST_PROGRAM_OPTIONS_FIX"
)
ENDIF
()
# -----------------------------------------------------------------------------------------------------------------------------------------------
# QT GUI
...
...
src/qtgui/CMakeLists.txt
View file @
52a8c077
...
...
@@ -90,6 +90,11 @@ INCLUDE_DIRECTORIES( SYSTEM ${QT_INCLUDE_DIR} )
# Add sources as target
# ---------------------------------------------------------------------------------------------------------------------------------------------------
IF
(
OW_BOOST_PO_FIX
)
# Disable if you get errors relating to program_options::arg when linking the binary
ADD_DEFINITIONS
(
"-DOW_BOOST_PROGRAM_OPTIONS_FIX"
)
ENDIF
()
# Collect the compile-files for this target
COLLECT_COMPILE_FILES
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
TARGET_CPP_FILES TARGET_H_FILES TARGET_TEST_FILES
)
...
...
src/scriptUI/CMakeLists.txt
View file @
52a8c077
...
...
@@ -40,6 +40,11 @@ SET( BinaryName "openwalnut-script" )
# Add sources as target
# ---------------------------------------------------------------------------------------------------------------------------------------------------
IF
(
OW_BOOST_PO_FIX
)
# Disable if you get errors relating to program_options::arg when linking the binary
ADD_DEFINITIONS
(
"-DOW_BOOST_PROGRAM_OPTIONS_FIX"
)
ENDIF
()
# Collect the compile-files for this target
COLLECT_COMPILE_FILES
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
TARGET_CPP_FILES TARGET_H_FILES TARGET_TEST_FILES
)
...
...
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