From 92a75ca6439e2fa1fed26526fe224e128b2e23ce Mon Sep 17 00:00:00 2001 From: arphaman Date: Wed, 17 Jul 2013 13:55:33 +0100 Subject: fixed linking and stdout file bug --- CMakeLists.txt | 13 ++++++++----- lib/IO/Write.cpp | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a27bd2..2d43103 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,8 @@ if(NOT MSVC) add_definitions(-std=c++11) endif() +set(libflang_sources) + macro(add_libflang_library name) set(srcs ${ARGN}) @@ -18,9 +20,6 @@ macro(add_libflang_library name) endif() add_library( ${name} ${libkind} ${srcs} ) - set_target_properties(${name} PROPERTIES FOLDER "Libflang libraries") - - list(APPEND libflang_libraries ${name}) endmacro(add_libflang_library) include_directories(include) @@ -36,8 +35,12 @@ else() set(libkind) endif() -add_library(libflang ${libkind} lib/Libflang.cpp) -target_link_libraries(libflang ${libflang_libraries}) +add_library(libflang ${libkind} lib/Libflang.cpp + lib/Core/Core.cpp + lib/Numerical/Complex.cpp + lib/Strings/Character.cpp + lib/IO/Write.cpp +) set(BUG_REPORT_URL "http://llvm.org/bugs/" CACHE STRING "Default URL where bug reports are to be submitted.") diff --git a/lib/IO/Write.cpp b/lib/IO/Write.cpp index 5d1b11e..dcb5241 100644 --- a/lib/IO/Write.cpp +++ b/lib/IO/Write.cpp @@ -38,7 +38,7 @@ static int getIntValue(WriteController *Controller, const void *Ptr, int32_t Siz } static FILE *getFilePtr(WriteController *Controller) { - return stdin; + return stdout; } class Buffer { -- cgit v1.2.1