Browse Source

MSVC build chain fixes

master
Artyom Beilis 14 years ago
parent
commit
adf728de94
7 changed files with 16 additions and 5 deletions
  1. +5
    -4
      CMakeLists.txt
  2. +1
    -1
      base_encryptor.cpp
  3. +1
    -0
      base_encryptor.h
  4. +1
    -0
      cache_interface.h
  5. +5
    -0
      cppcms_boost/CMakeLists.txt
  6. +1
    -0
      session_interface.h
  7. +2
    -0
      session_win32_file_storage.cpp

+ 5
- 4
CMakeLists.txt View File

@@ -171,10 +171,10 @@ if(CPPCMS_USE_EXTERNAL_BOOST)
add_definitions(-DBOOST_ZLIB_DYN_LINK)
endif(WIN32)
else(CPPCMS_USE_EXTERNAL_BOOST)
if(NOT DISABLE_STATIC)
add_definitions(-DCPPCMS_BOOST_ALL_NO_LIB)
add_definitions(-DCPPCMS_BOOST_ALL_NO_LIB)
if(NOT DISABLE_SHARED)
add_definitions(-DCPPCMS_BOOST_ALL_DYN_LINK)
endif(NOT DISABLE_STATIC)
endif(NOT DISABLE_SHARED)
endif(CPPCMS_USE_EXTERNAL_BOOST)

set(CPPCMS_PUBLIC_HEADERS
@@ -437,8 +437,9 @@ if(NOT DISABLE_SHARED)
${CMAKE_CURRENT_SOURCE_DIR}/hello_world_skin2.tmpl
${CMAKE_CURRENT_SOURCE_DIR}/hello_world_view1.tmpl)
add_library(skin3 MODULE skin3.cpp)
set(SKIN3_DEFS CPPCMS_SKIN_MODULE DLL_EXPORT)
set_target_properties(skin3 PROPERTIES
COMPILE_DEFINITIONS CPPCMS_SKIN_MODULE)
COMPILE_DEFINITIONS "${SKIN3_DEFS}")
target_link_libraries(skin3 ${CPPCMS_LIB})
endif(NOT DISABLE_SHARED)



+ 1
- 1
base_encryptor.cpp View File

@@ -59,7 +59,7 @@ string base_encryptor::base64_enc(vector<unsigned char> const &data)

void base_encryptor::base64_dec(std::string const &in,std::vector<unsigned char> &data)
{
ssize_t size=b64url::decoded_size(in.size());
int size=b64url::decoded_size(in.size());
if(size<0) return;
data.resize(size);
unsigned char const *ptr=(unsigned char const *)in.data();


+ 1
- 0
base_encryptor.h View File

@@ -6,6 +6,7 @@

#include "session_cookies.h"
#include "urandom.h"
#include "cstdint.h"

namespace cppcms {
namespace sessions {


+ 1
- 0
cache_interface.h View File

@@ -8,6 +8,7 @@
#include "noncopyable.h"
#include "intrusive_ptr.h"
#include "hold_ptr.h"
#include "cstdint.h"

namespace cppcms {



+ 5
- 0
cppcms_boost/CMakeLists.txt View File

@@ -29,6 +29,11 @@ set(BOOST_SRC
libs/filesystem/src/portability.cpp
libs/filesystem/src/path.cpp
libs/filesystem/src/operations.cpp
libs/date_time/src/gregorian/date_generators.cpp
libs/date_time/src/gregorian/greg_month.cpp
libs/date_time/src/gregorian/greg_weekday.cpp
libs/date_time/src/gregorian/gregorian_types.cpp
libs/date_time/src/posix_time/posix_time_types.cpp
)




+ 1
- 0
session_interface.h View File

@@ -5,6 +5,7 @@
#include "noncopyable.h"
#include "hold_ptr.h"
#include "intrusive_ptr.h"
#include "cstdint.h"
#include <string>
#include <map>
#include <memory>


+ 2
- 0
session_win32_file_storage.cpp View File

@@ -17,6 +17,8 @@
#include <sstream>
#include "cstdint.h"
namespace cppcms {
namespace sessions {


Loading…
Cancel
Save