Commit 52a8c077 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum

[FIX] cmake sets definitions on a per-directory basis -> hence the move into the gui dirs.

parent 130635f1
...@@ -140,10 +140,6 @@ ADD_SUBDIRECTORY( core ) ...@@ -140,10 +140,6 @@ ADD_SUBDIRECTORY( core )
# Activate Boost Fix: # Activate Boost Fix:
OPTION( OW_BOOST_PO_FIX "Enable this to enable the boost::program_options linker fix." ON ) 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 # QT GUI
......
...@@ -90,6 +90,11 @@ INCLUDE_DIRECTORIES( SYSTEM ${QT_INCLUDE_DIR} ) ...@@ -90,6 +90,11 @@ INCLUDE_DIRECTORIES( SYSTEM ${QT_INCLUDE_DIR} )
# Add sources as target # 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 the compile-files for this target
COLLECT_COMPILE_FILES( "${CMAKE_CURRENT_SOURCE_DIR}" TARGET_CPP_FILES TARGET_H_FILES TARGET_TEST_FILES ) COLLECT_COMPILE_FILES( "${CMAKE_CURRENT_SOURCE_DIR}" TARGET_CPP_FILES TARGET_H_FILES TARGET_TEST_FILES )
......
...@@ -40,6 +40,11 @@ SET( BinaryName "openwalnut-script" ) ...@@ -40,6 +40,11 @@ SET( BinaryName "openwalnut-script" )
# Add sources as target # 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 the compile-files for this target
COLLECT_COMPILE_FILES( "${CMAKE_CURRENT_SOURCE_DIR}" TARGET_CPP_FILES TARGET_H_FILES TARGET_TEST_FILES ) COLLECT_COMPILE_FILES( "${CMAKE_CURRENT_SOURCE_DIR}" TARGET_CPP_FILES TARGET_H_FILES TARGET_TEST_FILES )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment