Commit 4ed21c03 authored by Jan Koester's avatar Jan Koester
Browse files

now builds with systempp

parent b8a7bee3

CMakeLists.txt

+1 −9
Changes for CMakeLists.txt: 1 added line, 9 removed lines.
Original line number Diff line number Diff line
@@ -2,20 +2,12 @@ project(libhtmlpp) 
cmake_minimum_required(VERSION 3.0)

enable_testing ()



include(CheckIncludeFileCXX)



find_package(systempp REQUIRED)



set(LIBV "1.0.0")

set(Upstream_VERSION 1.0.0)



set(CMAKE_CXX_FLAGS 

    "-fPIC\

    -Wall\

    -nodefaultlibs\

    -nostdlib\

    "

)

SET(CMAKE_CXX_FLAGS "-fPIC -Wall -nostdlib")



configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)

src/CMakeLists.txt

+2 −0
Changes for src/CMakeLists.txt: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ set(libhtmlSrcs 
)



add_library(htmlpp        SHARED ${libhtmlSrcs} )

target_compile_definitions(htmlpp PUBLIC -DSHARED)



add_library(htmlpp-static STATIC ${libhtmlSrcs} )



generate_export_header(htmlpp)

src/html.cpp

+2 −3
Changes for src/html.cpp: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
#include <systempp/sysfile.h>

#include <systempp/sysutils.h>

#include <systempp/sysexception.h>

#include <systempp/config.h>



#include "utils.h"

#include "html.h"
@@ -46,9 +47,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
#define HTMLCOMMENT 2

#define HTMLHEADER 3



extern "C" {

    void *__dso_handle=&__dso_handle;

}

void *__dso_handle __attribute__((__visibility__("hidden"))) __attribute__((weak)) = &__dso_handle;



libhtmlpp::HtmlString::HtmlString(){

    _InitString();

test/csstest.cpp

+2 −0
Changes for test/csstest.cpp: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
#define Green   "\033[0;32m"

#define NOCOLOR "\033[0m"



void *__dso_handle __attribute__((__visibility__("hidden"))) __attribute__((weak)) = nullptr;



int main(){

    libhtmlpp::HtmlTable table;

    try{

test/htmlpagetest.cpp

+2 −0
Changes for test/htmlpagetest.cpp: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
#define Green   "\033[0;32m"

#define NOCOLOR "\033[0m"



void *__dso_handle __attribute__((__visibility__("hidden"))) __attribute__((weak)) = nullptr;



int main(int arc,char *argv[]){

    libhtmlpp::HtmlPage page;

    try{