Skip to content

Update site-src #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update site-src #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11c1fd1
update easylogging to [9.95.3] - 13-10-2017
Nov 2, 2017
73b26bb
update eigen to 3.3.90
Nov 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ endif() # NLA3D_USE_MKL
find_package(EASYLOGGINGPP)
if (EASYLOGGINGPP_FOUND)
include_directories(${EASYLOGGINGPP_INCLUDE_DIR})
add_definitions(-DELPP_STL_LOGGING -DELPP_FEATURE_PERFORMANCE_TRACKING)
else()
message(WARNING "Can't find Easylogging++")
endif()
Expand Down
8 changes: 6 additions & 2 deletions cmake/modules/FindEASYLOGGINGPP.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CMake module to find easylogging++ library
include(FindPackageHandleStandardArgs)

FIND_PATH(
EASYLOGGINGPP_INCLUDE_DIR
easylogging++.h
Expand All @@ -11,5 +11,9 @@ FIND_PATH(
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/site-src/easyloggingpp/src
DOC "Path to directory where easylogging++.h is stored"
)

FIND_PACKAGE_HANDLE_STANDARD_ARGS(EASYLOGGINGPP DEFAULT_MSG EASYLOGGINGPP_INCLUDE_DIR)

if(EASYLOGGINGPP_FOUND)
set(EASYLOGGINGPP_SOURCE "${EASYLOGGINGPP_INCLUDE_DIR}/easylogging++.cc")
endif()
2 changes: 1 addition & 1 deletion site-src/easyloggingpp
Open in desktop
Submodule easyloggingpp updated from 479fad to b7b4cb
2 changes: 1 addition & 1 deletion site-src/eigen
Open in desktop
Submodule eigen updated from c357eb to 682aa9
4 changes: 2 additions & 2 deletions src/lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ add_subdirectory (math)
file (GLOB NLA3D_LIB_SOURCES "*.cpp" "materials/*.cpp" "elements/*.cpp")

if (UNIX)
add_library(nla3d_lib SHARED ${NLA3D_LIB_SOURCES})
add_library(nla3d_lib SHARED ${NLA3D_LIB_SOURCES} ${EASYLOGGINGPP_SOURCE})
else()
add_library(nla3d_lib STATIC ${NLA3D_LIB_SOURCES})
add_library(nla3d_lib STATIC ${NLA3D_LIB_SOURCES} ${EASYLOGGINGPP_SOURCE})
endif()

target_link_libraries(nla3d_lib math ${MKL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
Expand Down
2 changes: 0 additions & 2 deletions src/lib/sys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include <string>
#include <iostream>
#include <fstream>
#include <strstream>
#include <stdarg.h>
#include <assert.h>
#include <time.h>
Expand All @@ -21,7 +20,6 @@
#include <algorithm>
#include <stdlib.h>

#define ELPP_STL_LOGGING
#include "easylogging++.h"

#define _USE_MATH_DEFINES
Expand Down