diff --git a/CMakeLists.txt b/CMakeLists.txt index 78624e8..e8f356d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,8 +17,6 @@ endif() if (WINDOWS) SET(CMAKE_SYSTEM_NAME Windows) ADD_DEFINITIONS(-D WINDOWS=1) -else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++") endif(WINDOWS) message(STATUS "Using: @@ -41,7 +39,7 @@ if (NOT EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -s compiler=clang -s compiler.libcxx=libstdc++11 -s compiler.version=${VERSION}) else() execute_process(COMMAND conan install ${CMAKE_SOURCE_DIR} --install-folder=${CMAKE_BINARY_DIR} --build missing - -s compiler=gcc -s compiler.libcxx=libstdc++11 -s compiler.version=${VERSION} -s os=Windows) + -s compiler=gcc -s compiler.libcxx=libstdc++11 -s compiler.version=${VERSION} -s os=Windows -o CreatureLib:staticC=True) endif() endif () include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)