sp
/
tempest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fixed include pathes for CUDD in CMakeLists.txt 

Added a variadic macro for MSVC since the PrismGrammar makes use of emplace magic
Patched log4cplus to disable unicode from a parent project
"Patched" various serious issues in CUDD, where size_t <-> int problems and forced int to bool conversions piss of the compiler. And me.


Former-commit-id: eb27e77ddd
tempestpy_adaptions
PBerger 11 years ago
parent
659df778dd
commit
11198c648c
6 changed files with 69 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      CMakeLists.txt
  2. 6
      resources/3rdparty/cudd-2.5.0/CMakeLists.txt
  3. 76
      resources/3rdparty/cudd-2.5.0/src/obj/cuddObj.cc
  4. 2
      resources/3rdparty/cudd-2.5.0/src/obj/cuddObj.hh
  5. 14
      resources/3rdparty/log4cplus-1.1.2-rc2/CMakeLists.txt
  6. 4
      resources/3rdparty/log4cplus-1.1.2-rc2/src/CMakeLists.txt

18
CMakeLists.txt
View File

@ -63,6 +63,8 @@ elseif(MSVC)
add_definitions(/D_SCL_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS) add_definitions(/D_SCL_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS)
# required as the PRCTL Parser bloats object files (COFF) beyond their maximum size (see http://msdn.microsoft.com/en-us/library/8578y171(v=vs.110).aspx) # required as the PRCTL Parser bloats object files (COFF) beyond their maximum size (see http://msdn.microsoft.com/en-us/library/8578y171(v=vs.110).aspx)
add_definitions(/bigobj) add_definitions(/bigobj)
# required by GTest and PrismGrammar::createIntegerVariable
add_definitions(/D_VARIADIC_MAX=10)
# MSVC does not do strict-aliasing, so no option needed # MSVC does not do strict-aliasing, so no option needed
else(CLANG) else(CLANG)
@ -240,7 +242,13 @@ target_link_libraries(storm-performance-tests ${Boost_LIBRARIES})
## ##
############################################################# #############################################################
add_subdirectory("${PROJECT_SOURCE_DIR}/resources/3rdparty/cudd-2.5.0") add_subdirectory("${PROJECT_SOURCE_DIR}/resources/3rdparty/cudd-2.5.0")
include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/cudd-2.5.0/src/cudd")
include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/cudd-2.5.0/src/epd")
include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/cudd-2.5.0/src/mtr")
include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/cudd-2.5.0/src/nanotrav")
include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/cudd-2.5.0/src/obj") include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/cudd-2.5.0/src/obj")
include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/cudd-2.5.0/src/st")
include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/cudd-2.5.0/src/util")
target_link_libraries(storm cudd) target_link_libraries(storm cudd)
target_link_libraries(storm-functional-tests cudd) target_link_libraries(storm-functional-tests cudd)
target_link_libraries(storm-performance-tests cudd) target_link_libraries(storm-performance-tests cudd)
@ -274,12 +282,14 @@ add_test(NAME storm-performance-tests COMMAND storm-performance-tests)
## Log4CPlus ## Log4CPlus
## ##
############################################################# #############################################################
set(BUILD_SHARED_LIBS NO)
set(BUILD_SHARED_LIBS OFF CACHE BOOL "If TRUE, log4cplus is built as a shared library, otherwise as a static library")
set(LOG4CPLUS_BUILD_TESTING NO)
set(LOG4CPLUS_USE_UNICODE OFF)
add_subdirectory("${PROJECT_SOURCE_DIR}/resources/3rdparty/log4cplus-1.1.2-rc2") add_subdirectory("${PROJECT_SOURCE_DIR}/resources/3rdparty/log4cplus-1.1.2-rc2")
include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/log4cplus-1.1.2-rc2/include") include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/log4cplus-1.1.2-rc2/include")
target_link_libraries(storm log4cplus)
target_link_libraries(storm-functional-tests log4cplus)
target_link_libraries(storm-performance-tests log4cplus)
target_link_libraries(storm log4cplusS)
target_link_libraries(storm-functional-tests log4cplusS)
target_link_libraries(storm-performance-tests log4cplusS)
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)
target_link_libraries(storm rt) target_link_libraries(storm rt)
if (STORM_USE_COTIRE) if (STORM_USE_COTIRE)

6
resources/3rdparty/cudd-2.5.0/CMakeLists.txt
View File

@ -1,11 +1,13 @@
cmake_minimum_required (VERSION 2.8.6) cmake_minimum_required (VERSION 2.8.6)
# Set project name # Set project name
project (cudd C)
project (cudd C CXX)
# Main Sources # Main Sources
file(GLOB_RECURSE CUDD_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h) file(GLOB_RECURSE CUDD_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h)
file(GLOB_RECURSE CUDD_HEADERS_CXX ${PROJECT_SOURCE_DIR}/src/*.hh)
file(GLOB_RECURSE CUDD_SOURCES ${PROJECT_SOURCE_DIR}/src/*.c) file(GLOB_RECURSE CUDD_SOURCES ${PROJECT_SOURCE_DIR}/src/*.c)
file(GLOB_RECURSE CUDD_SOURCES_CXX ${PROJECT_SOURCE_DIR}/src/*.cc)
# Add base folder for better inclusion paths # Add base folder for better inclusion paths
@ -24,4 +26,4 @@ if(MSVC)
endif() endif()
# Add the library # Add the library
add_library(cudd ${CUDD_SOURCES} ${CUDD_HEADERS})
add_library(cudd ${CUDD_SOURCES} ${CUDD_HEADERS} ${CUDD_HEADERS_CXX} ${CUDD_SOURCES_CXX})

76
resources/3rdparty/cudd-2.5.0/src/obj/cuddObj.cc
View File

@ -352,7 +352,7 @@ BDD::operator<=(
const BDD& other) const const BDD& other) const
{ {
DdManager *mgr = checkSameManager(other); DdManager *mgr = checkSameManager(other);
return Cudd_bddLeq(mgr,node,other.node);
return Cudd_bddLeq(mgr,node,other.node) != 0;
} // BDD::operator<= } // BDD::operator<=
@ -362,7 +362,7 @@ BDD::operator>=(
const BDD& other) const const BDD& other) const
{ {
DdManager *mgr = checkSameManager(other); DdManager *mgr = checkSameManager(other);
return Cudd_bddLeq(mgr,other.node,node);
return Cudd_bddLeq(mgr,other.node,node) != 0;
} // BDD::operator>= } // BDD::operator>=
@ -372,7 +372,7 @@ BDD::operator<(
const BDD& other) const const BDD& other) const
{ {
DdManager *mgr = checkSameManager(other); DdManager *mgr = checkSameManager(other);
return node != other.node && Cudd_bddLeq(mgr,node,other.node);
return node != other.node && (Cudd_bddLeq(mgr,node,other.node) != 0);
} // BDD::operator< } // BDD::operator<
@ -382,7 +382,7 @@ BDD::operator>(
const BDD& other) const const BDD& other) const
{ {
DdManager *mgr = checkSameManager(other); DdManager *mgr = checkSameManager(other);
return node != other.node && Cudd_bddLeq(mgr,other.node,node);
return node != other.node && (Cudd_bddLeq(mgr,other.node,node) != 0);
} // BDD::operator> } // BDD::operator>
@ -605,7 +605,7 @@ ADD::operator<=(
const ADD& other) const const ADD& other) const
{ {
DdManager *mgr = checkSameManager(other); DdManager *mgr = checkSameManager(other);
return Cudd_addLeq(mgr,node,other.node);
return Cudd_addLeq(mgr,node,other.node) != 0;
} // ADD::operator<= } // ADD::operator<=
@ -615,7 +615,7 @@ ADD::operator>=(
const ADD& other) const const ADD& other) const
{ {
DdManager *mgr = checkSameManager(other); DdManager *mgr = checkSameManager(other);
return Cudd_addLeq(mgr,other.node,node);
return Cudd_addLeq(mgr,other.node,node) != 0;
} // ADD::operator>= } // ADD::operator>=
@ -625,7 +625,7 @@ ADD::operator<(
const ADD& other) const const ADD& other) const
{ {
DdManager *mgr = checkSameManager(other); DdManager *mgr = checkSameManager(other);
return node != other.node && Cudd_addLeq(mgr,node,other.node);
return node != other.node && (Cudd_addLeq(mgr,node,other.node) != 0);
} // ADD::operator< } // ADD::operator<
@ -635,7 +635,7 @@ ADD::operator>(
const ADD& other) const const ADD& other) const
{ {
DdManager *mgr = checkSameManager(other); DdManager *mgr = checkSameManager(other);
return node != other.node && Cudd_addLeq(mgr,other.node,node);
return node != other.node && (Cudd_addLeq(mgr,other.node,node) != 0);
} // ADD::operator> } // ADD::operator>
@ -1505,7 +1505,7 @@ Cudd::UnsetTimeLimit() const
bool bool
Cudd::TimeLimited() const Cudd::TimeLimited() const
{ {
return Cudd_TimeLimited(p->manager);
return Cudd_TimeLimited(p->manager) != 0;
} // Cudd::TimeLimited } // Cudd::TimeLimited
@ -1531,7 +1531,7 @@ bool
Cudd::ReorderingStatus( Cudd::ReorderingStatus(
Cudd_ReorderingType * method) const Cudd_ReorderingType * method) const
{ {
return Cudd_ReorderingStatus(p->manager, method);
return Cudd_ReorderingStatus(p->manager, method) != 0;
} // Cudd::ReorderingStatus } // Cudd::ReorderingStatus
@ -1557,7 +1557,7 @@ bool
Cudd::ReorderingStatusZdd( Cudd::ReorderingStatusZdd(
Cudd_ReorderingType * method) const Cudd_ReorderingType * method) const
{ {
return Cudd_ReorderingStatusZdd(p->manager, method);
return Cudd_ReorderingStatusZdd(p->manager, method) != 0;
} // Cudd::ReorderingStatusZdd } // Cudd::ReorderingStatusZdd
@ -1565,7 +1565,7 @@ Cudd::ReorderingStatusZdd(
bool bool
Cudd::zddRealignmentEnabled() const Cudd::zddRealignmentEnabled() const
{ {
return Cudd_zddRealignmentEnabled(p->manager);
return Cudd_zddRealignmentEnabled(p->manager) != 0;
} // Cudd::zddRealignmentEnabled } // Cudd::zddRealignmentEnabled
@ -1589,7 +1589,7 @@ Cudd::zddRealignDisable() const
bool bool
Cudd::bddRealignmentEnabled() const Cudd::bddRealignmentEnabled() const
{ {
return Cudd_bddRealignmentEnabled(p->manager);
return Cudd_bddRealignmentEnabled(p->manager) != 0;
} // Cudd::bddRealignmentEnabled } // Cudd::bddRealignmentEnabled
@ -2004,7 +2004,7 @@ Cudd::SetGroupcheck(
bool bool
Cudd::GarbageCollectionEnabled() const Cudd::GarbageCollectionEnabled() const
{ {
return Cudd_GarbageCollectionEnabled(p->manager);
return Cudd_GarbageCollectionEnabled(p->manager) != 0;
} // Cudd::GarbageCollectionEnabled } // Cudd::GarbageCollectionEnabled
@ -2028,7 +2028,7 @@ Cudd::DisableGarbageCollection() const
bool bool
Cudd::DeadAreCounted() const Cudd::DeadAreCounted() const
{ {
return Cudd_DeadAreCounted(p->manager);
return Cudd_DeadAreCounted(p->manager) != 0;
} // Cudd::DeadAreCounted } // Cudd::DeadAreCounted
@ -2210,7 +2210,7 @@ Cudd::IsInHook(
DD_HFP f, DD_HFP f,
Cudd_HookType where) const Cudd_HookType where) const
{ {
return Cudd_IsInHook(p->manager, f, where);
return Cudd_IsInHook(p->manager, f, where) != 0;
} // Cudd::IsInHook } // Cudd::IsInHook
@ -2236,7 +2236,7 @@ Cudd::DisableReorderingReporting() const
bool bool
Cudd::ReorderingReporting() const Cudd::ReorderingReporting() const
{ {
return Cudd_ReorderingReporting(p->manager);
return Cudd_ReorderingReporting(p->manager) != 0;
} // Cudd::ReorderingReporting } // Cudd::ReorderingReporting
@ -2365,7 +2365,7 @@ Cudd::bddUnbindVar(int index) const
bool bool
Cudd::bddVarIsBound(int index) const Cudd::bddVarIsBound(int index) const
{ {
return Cudd_bddVarIsBound(p->manager, index);
return Cudd_bddVarIsBound(p->manager, index) != 0;
} // Cudd::bddVarIsBound } // Cudd::bddVarIsBound
@ -2700,7 +2700,7 @@ ADD::Leq(
const ADD& g) const const ADD& g) const
{ {
DdManager *mgr = checkSameManager(g); DdManager *mgr = checkSameManager(g);
return Cudd_addLeq(mgr, node, g.node);
return Cudd_addLeq(mgr, node, g.node) != 0;
} // ADD::Leq } // ADD::Leq
@ -2744,14 +2744,14 @@ Cudd::Walsh(
vector<ADD> x, vector<ADD> x,
vector<ADD> y) vector<ADD> y)
{ {
int n = x.size();
size_t n = x.size();
DdNode **X = new DdNode *[n]; DdNode **X = new DdNode *[n];
DdNode **Y = new DdNode *[n]; DdNode **Y = new DdNode *[n];
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
X[i] = x[i].getNode(); X[i] = x[i].getNode();
Y[i] = y[i].getNode(); Y[i] = y[i].getNode();
} }
DdNode *result = Cudd_addWalsh(p->manager, X, Y, n);
DdNode *result = Cudd_addWalsh(p->manager, X, Y, static_cast<int>(n));
delete [] X; delete [] X;
delete [] Y; delete [] Y;
checkReturnValue(result); checkReturnValue(result);
@ -3172,7 +3172,7 @@ BDD::VarIsDependent(
const BDD& var) const const BDD& var) const
{ {
DdManager *mgr = p->manager; DdManager *mgr = p->manager;
return Cudd_bddVarIsDependent(mgr, node, var.node);
return Cudd_bddVarIsDependent(mgr, node, var.node) != 0;
} // BDD::VarIsDependent } // BDD::VarIsDependent
@ -3335,7 +3335,7 @@ BDD::Leq(
const BDD& g) const const BDD& g) const
{ {
DdManager *mgr = checkSameManager(g); DdManager *mgr = checkSameManager(g);
return Cudd_bddLeq(mgr, node, g.node);
return Cudd_bddLeq(mgr, node, g.node) != 0;
} // BDD::Leq } // BDD::Leq
@ -3540,7 +3540,7 @@ ADD::SwapVariables(
vector<ADD> x, vector<ADD> x,
vector<ADD> y) const vector<ADD> y) const
{ {
int n = x.size();
size_t n = x.size();
DdManager *mgr = p->manager; DdManager *mgr = p->manager;
DdNode **X = new DdNode *[n]; DdNode **X = new DdNode *[n];
DdNode **Y = new DdNode *[n]; DdNode **Y = new DdNode *[n];
@ -3548,7 +3548,7 @@ ADD::SwapVariables(
X[i] = x[i].node; X[i] = x[i].node;
Y[i] = y[i].node; Y[i] = y[i].node;
} }
DdNode *result = Cudd_addSwapVariables(mgr, node, X, Y, n);
DdNode *result = Cudd_addSwapVariables(mgr, node, X, Y, static_cast<int>(n));
delete [] X; delete [] X;
delete [] Y; delete [] Y;
checkReturnValue(result); checkReturnValue(result);
@ -3574,7 +3574,7 @@ BDD::SwapVariables(
std::vector<BDD> x, std::vector<BDD> x,
std::vector<BDD> y) const std::vector<BDD> y) const
{ {
int n = x.size();
size_t n = x.size();
DdManager *mgr = p->manager; DdManager *mgr = p->manager;
DdNode **X = new DdNode *[n]; DdNode **X = new DdNode *[n];
DdNode **Y = new DdNode *[n]; DdNode **Y = new DdNode *[n];
@ -3582,7 +3582,7 @@ BDD::SwapVariables(
X[i] = x[i].node; X[i] = x[i].node;
Y[i] = y[i].node; Y[i] = y[i].node;
} }
DdNode *result = Cudd_bddSwapVariables(mgr, node, X, Y, n);
DdNode *result = Cudd_bddSwapVariables(mgr, node, X, Y, static_cast<int>(n));
delete [] X; delete [] X;
delete [] Y; delete [] Y;
checkReturnValue(result); checkReturnValue(result);
@ -3595,13 +3595,13 @@ BDD
BDD::AdjPermuteX( BDD::AdjPermuteX(
vector<BDD> x) const vector<BDD> x) const
{ {
int n = x.size();
size_t n = x.size();
DdManager *mgr = p->manager; DdManager *mgr = p->manager;
DdNode **X = new DdNode *[n]; DdNode **X = new DdNode *[n];
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
X[i] = x[i].node; X[i] = x[i].node;
} }
DdNode *result = Cudd_bddAdjPermuteX(mgr, node, X, n);
DdNode *result = Cudd_bddAdjPermuteX(mgr, node, X, static_cast<int>(n));
delete [] X; delete [] X;
checkReturnValue(result); checkReturnValue(result);
return BDD(p, result); return BDD(p, result);
@ -3811,7 +3811,7 @@ bool
ABDD::IsCube() const ABDD::IsCube() const
{ {
DdManager *mgr = p->manager; DdManager *mgr = p->manager;
return Cudd_CheckCube(mgr, node);
return Cudd_CheckCube(mgr, node) != 0;
} // ABDD::IsCube } // ABDD::IsCube
@ -3833,7 +3833,7 @@ BDD::IsVarEssential(
int phase) const int phase) const
{ {
DdManager *mgr = p->manager; DdManager *mgr = p->manager;
return Cudd_bddIsVarEssential(mgr, node, id, phase);
return Cudd_bddIsVarEssential(mgr, node, id, phase) != 0;
} // BDD::IsVarEssential } // BDD::IsVarEssential
@ -3860,12 +3860,12 @@ Cudd::DumpBlif(
int mv) const int mv) const
{ {
DdManager *mgr = p->manager; DdManager *mgr = p->manager;
int n = nodes.size();
size_t n = nodes.size();
DdNode **F = new DdNode *[n]; DdNode **F = new DdNode *[n];
for (int i = 0; i < n; i ++) {
for (size_t i = 0; i < n; i ++) {
F[i] = nodes[i].getNode(); F[i] = nodes[i].getNode();
} }
int result = Cudd_DumpBlif(mgr, n, F, inames, onames, mname, fp, mv);
int result = Cudd_DumpBlif(mgr, static_cast<int>(n), F, inames, onames, mname, fp, mv);
delete [] F; delete [] F;
checkReturnValue(result); checkReturnValue(result);
@ -4702,7 +4702,7 @@ ABDD::EquivDC(
{ {
DdManager *mgr = checkSameManager(G); DdManager *mgr = checkSameManager(G);
checkSameManager(D); checkSameManager(D);
return Cudd_EquivDC(mgr, node, G.node, D.node);
return Cudd_EquivDC(mgr, node, G.node, D.node) != 0;
} // ABDD::EquivDC } // ABDD::EquivDC
@ -4714,7 +4714,7 @@ BDD::LeqUnless(
DdManager *mgr = checkSameManager(G); DdManager *mgr = checkSameManager(G);
checkSameManager(D); checkSameManager(D);
int res = Cudd_bddLeqUnless(mgr, node, G.node, D.node); int res = Cudd_bddLeqUnless(mgr, node, G.node, D.node);
return res;
return res != 0;
} // BDD::LeqUnless } // BDD::LeqUnless
@ -4726,7 +4726,7 @@ ADD::EqualSupNorm(
int pr) const int pr) const
{ {
DdManager *mgr = checkSameManager(g); DdManager *mgr = checkSameManager(g);
return Cudd_EqualSupNorm(mgr, node, g.node, tolerance, pr);
return Cudd_EqualSupNorm(mgr, node, g.node, tolerance, pr) != 0;
} // ADD::EqualSupNorm } // ADD::EqualSupNorm
@ -5009,7 +5009,7 @@ Cudd::SharingSize(
for (vector<BDD>::size_type i = 0; i != n; ++i) { for (vector<BDD>::size_type i = 0; i != n; ++i) {
nodeArray[i] = v[i].getNode(); nodeArray[i] = v[i].getNode();
} }
int result = Cudd_SharingSize(nodeArray, n);
int result = Cudd_SharingSize(nodeArray, static_cast<int>(n));
delete [] nodeArray; delete [] nodeArray;
checkReturnValue(n == 0 || result > 0); checkReturnValue(n == 0 || result > 0);
return result; return result;

2
resources/3rdparty/cudd-2.5.0/src/obj/cuddObj.hh
View File

@ -138,7 +138,7 @@ public:
DD(Cudd const & manager, DdNode *ddNode); DD(Cudd const & manager, DdNode *ddNode);
DD(const DD &from); DD(const DD &from);
virtual ~DD(); virtual ~DD();
operator bool() const { return node; }
operator bool() const { return node != 0; }
DdManager *manager() const; DdManager *manager() const;
DdNode * getNode() const; DdNode * getNode() const;
DdNode * getRegularNode() const; DdNode * getRegularNode() const;

14
resources/3rdparty/log4cplus-1.1.2-rc2/CMakeLists.txt
View File

@ -23,7 +23,7 @@ message (STATUS "Threads: ${CMAKE_THREAD_LIBS_INIT}")
set(BUILD_SHARED_LIBS TRUE CACHE BOOL "If TRUE, log4cplus is built as a shared library, otherwise as a static library") set(BUILD_SHARED_LIBS TRUE CACHE BOOL "If TRUE, log4cplus is built as a shared library, otherwise as a static library")
message(STATUS "Building shared libs: ${BUILD_SHARED_LIBS}")
message(STATUS "Log4CPlus - Building shared libs: ${BUILD_SHARED_LIBS}")
if (WIN32) if (WIN32)
set (UNICODE_DEFAULT ON) set (UNICODE_DEFAULT ON)
@ -34,7 +34,7 @@ endif (WIN32)
if (MSVC) if (MSVC)
set (LOG4CPLUS_WORKING_LOCALE_DEFAULT ON) set (LOG4CPLUS_WORKING_LOCALE_DEFAULT ON)
else (MSVC) else (MSVC)
set (CMAKE_CXX_FLAGS "-std=c++11")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set (LOG4CPLUS_WORKING_LOCALE_DEFAULT OFF) set (LOG4CPLUS_WORKING_LOCALE_DEFAULT OFF)
endif (MSVC) endif (MSVC)
@ -59,9 +59,13 @@ if (NOT ${BUILD_SHARED_LIBS})
set (log4cplus_postfix "${log4cplus_postfix}S") set (log4cplus_postfix "${log4cplus_postfix}S")
endif() endif()
if (UNICODE)
if (UNICODE AND (DEFINED LOG4CPLUS_USE_UNICODE AND LOG4CPLUS_USE_UNICODE))
set (log4cplus_postfix "${log4cplus_postfix}U") set (log4cplus_postfix "${log4cplus_postfix}U")
endif (UNICODE)
message(STATUS "Log4CPlus - Using Unicode: YES")
else()
message(STATUS "Log4CPlus - Using Unicode: NO")
set(UNICODE OFF)
endif()
if (WITH_ICONV) if (WITH_ICONV)
set(LOG4CPLUS_WITH_ICONV 1) set(LOG4CPLUS_WITH_ICONV 1)
@ -94,7 +98,7 @@ if (LOG4CPLUS_BUILD_TESTING)
endif (LOG4CPLUS_BUILD_TESTING) endif (LOG4CPLUS_BUILD_TESTING)
add_subdirectory (src) add_subdirectory (src)
add_subdirectory (loggingserver)
#add_subdirectory (loggingserver)
if (LOG4CPLUS_BUILD_TESTING) if (LOG4CPLUS_BUILD_TESTING)
add_subdirectory (tests) add_subdirectory (tests)
endif (LOG4CPLUS_BUILD_TESTING) endif (LOG4CPLUS_BUILD_TESTING)

4
resources/3rdparty/log4cplus-1.1.2-rc2/src/CMakeLists.txt
View File

@ -51,7 +51,7 @@ set (log4cplus_sources
#message (STATUS "Type: ${UNIX}|${CYGWIN}|${WIN32}") #message (STATUS "Type: ${UNIX}|${CYGWIN}|${WIN32}")
if ("${UNIX}" OR "${CYGWIN}")
if ("${UNIX}" OR "${CYGWIN}" OR APPLE)
set (log4cplus_sources ${log4cplus_sources} set (log4cplus_sources ${log4cplus_sources}
socket-unix.cxx) socket-unix.cxx)
elseif (WIN32) elseif (WIN32)
@ -67,6 +67,8 @@ endif ()
if (UNICODE) if (UNICODE)
add_definitions (-DUNICODE -D_UNICODE -UMBCS -U_MBCS) add_definitions (-DUNICODE -D_UNICODE -UMBCS -U_MBCS)
else(UNICODE)
add_definitions (-UUNICODE -U_UNICODE -DMBCS -D_MBCS)
endif (UNICODE) endif (UNICODE)
if (WIN32) if (WIN32)
add_definitions (-DMINGW_HAS_SECURE_API=1) add_definitions (-DMINGW_HAS_SECURE_API=1)

Write Preview
Loading…
Cancel
Save