Skip to content

Commit

Permalink
Fixed building shared library in Visual Studio due to std::vector bei…
Browse files Browse the repository at this point in the history
…ng specified with an incomplete type, made selecting SFML's link type separate from selecting SFGUI's link type, renamed "test" example to "SFGUI-Test" in order to fix a CMake policy warning.
  • Loading branch information
binary1248 committed Oct 14, 2014
1 parent 61ba910 commit a954417
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 11 deletions.
6 changes: 1 addition & 5 deletions CMakeLists.txt
Expand Up @@ -11,11 +11,7 @@ set( SFGUI_BUILD_SHARED_LIBS true CACHE BOOL "Build shared library." )
set( SFGUI_BUILD_EXAMPLES true CACHE BOOL "Build examples." )
set( SFGUI_BUILD_DOC false CACHE BOOL "Generate API documentation." )
set( SFGUI_INCLUDE_FONT true CACHE BOOL "Include default font in library (DejaVuSans)." )

# Make sure to look for the static SFML libraries
if( NOT SFGUI_BUILD_SHARED_LIBS )
set( SFML_STATIC_LIBRARIES true )
endif()
set( SFML_STATIC_LIBRARIES true CACHE BOOL "Do you want to link SFML statically?" )

# Tell CMake where to find additional find modules
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/Modules/" )
Expand Down
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
Expand Up @@ -37,7 +37,7 @@ build_example( "Buttons" "Buttons.cpp" )
build_example( "ProgressBar" "ProgressBar.cpp" )
build_example( "SpinButton" "SpinButton.cpp" )
build_example( "Canvas" "Canvas.cpp" )
build_example( "test" "Test.cpp" )
build_example( "SFGUI-Test" "Test.cpp" )

# Copy data directory to build cache directory to be able to run examples from
# there. Useful for testing stuff.
Expand Down
5 changes: 1 addition & 4 deletions include/SFGUI/ComboBox.hpp
Expand Up @@ -2,13 +2,10 @@

#include <SFGUI/Bin.hpp>

#include <SFML/System/String.hpp>
#include <vector>
#include <memory>

namespace sf {
class String;
}

namespace sfg {

class Scrollbar;
Expand Down
2 changes: 1 addition & 1 deletion include/SFGUI/Primitive.hpp
@@ -1,6 +1,7 @@
#pragma once

#include <SFGUI/Config.hpp>
#include <SFGUI/PrimitiveVertex.hpp>

#include <SFML/System/Vector2.hpp>
#include <vector>
Expand All @@ -11,7 +12,6 @@ namespace sfg {
class Signal;
class RendererViewport;
class PrimitiveTexture;
class PrimitiveVertex;

/** Renderer primitive.
*/
Expand Down

0 comments on commit a954417

Please sign in to comment.