Skip to content

Commit

Permalink
passing all tests with cmake. EGL/OpenGL doesnt work with docker. Apps
Browse files Browse the repository at this point in the history
need configuration
  • Loading branch information
daeyun committed Jul 26, 2017
1 parent 958a61e commit e101cde
Show file tree
Hide file tree
Showing 54 changed files with 1,979 additions and 1,892 deletions.
13 changes: 0 additions & 13 deletions .clion/.bazelproject

This file was deleted.

11 changes: 0 additions & 11 deletions .clion/.blaze/modules/.project-data-dir.iml

This file was deleted.

18 changes: 0 additions & 18 deletions .clion/.blaze/modules/.workspace.iml

This file was deleted.

1 change: 0 additions & 1 deletion .clion/.idea/.name

This file was deleted.

6 changes: 0 additions & 6 deletions .clion/.idea/externalDependencies.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .clion/.idea/modules.xml

This file was deleted.

17 changes: 0 additions & 17 deletions .clion/.idea/runConfigurations.xml

This file was deleted.

37 changes: 4 additions & 33 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
#set(CMAKE_C_COMPILER ${CMAKE_SOURCE_DIR}/third_party/nix_env/bin/gcc)
#set(CMAKE_CXX_COMPILER ${CMAKE_SOURCE_DIR}/third_party/nix_env/bin/g++)

# ---

cmake_minimum_required(VERSION 3.5)
project(mvshape CXX)

Expand All @@ -11,44 +6,20 @@ set(CMAKE_VERBOSE_MAKEFILE ON)

find_package(Threads REQUIRED)

#set(CMAKE_C_FLAGS "-nostdinc++ -nostdinc")
#set(CMAKE_CXX_FLAGS "-nostdinc++ -nostdinc")

set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed,--no-undefined,--error-unresolved-symbols")
set(CMAKE_EXEC_LINKER_FLAGS "-Wl,--as-needed,--no-undefined,--error-unresolved-symbols")

#SET(CMAKE_SKIP_BUILD_RPATH FALSE)
#SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
#SET(CMAKE_INSTALL_RPATH
# $ORIGIN
# /usr/lib/nvidia-381
# ${CMAKE_SOURCE_DIR}/third_party/nix_env/lib/
# ${CMAKE_SOURCE_DIR}/third_party/nix_env/lib64/
# ${CMAKE_SOURCE_DIR}/third_party/nix_env/lib/gcc/x86_64-pc-linux-gnu/6.4.0/
# ${CMAKE_BINARY_DIR}/proto/
# $ORIGIN/../egl/
# /usr/lib/x86_64-linux-gnu/
# /lib/x86_64-linux-gnu/
# )
#SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)

#include_directories(BEFORE
# ${CMAKE_SOURCE_DIR}/third_party/nix_env/include
# ${CMAKE_SOURCE_DIR}/third_party/nix_env/include/c++/6.4.0
# ${CMAKE_SOURCE_DIR}/third_party/nix_env/include/c++/6.4.0/x86_64-pc-linux-gnu
# ${CMAKE_SOURCE_DIR}/third_party/nix_env/lib/gcc/x86_64-pc-linux-gnu/6.4.0/include
# ${CMAKE_SOURCE_DIR}/third_party/nix_env/lib/gcc/x86_64-pc-linux-gnu/6.4.0/include-fixed
# )
set(CMAKE_EXE_LINKER_FLAGS
"${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath=/usr/local/cuda-8.0/lib64")

set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -mfpmath=both -march=native")


# ---

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/third_party/cmake/Modules/")
set(CMAKE_PREFIX_PATH ${CMAKE_SOURCE_DIR}/third_party/nix_env)


include(third_party/CMakeLists.txt)

add_subdirectory(proto)

add_subdirectory(cpp)
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ RUN apt-get install -y libopencv-dev

# Install gflags, gtest, glog
RUN apt-get install -y libgflags-dev libgtest-dev libgoogle-glog-dev
#https://askubuntu.com/questions/145887/why-no-library-files-installed-for-google-test
RUN cd /usr/src/gtest && cmake . && make -j4 && mv libg* /usr/lib/

# Install other dependencies
RUN apt-get install -y libblosc-dev libsqlite3-dev libassimp-dev assimp-utils libprotobuf-dev
#Install other dependencies
RUN apt-get install -y libblosc-dev libsqlite3-dev libassimp-dev assimp-utils libboost-all-dev libglm-dev
125 changes: 0 additions & 125 deletions WORKSPACE

This file was deleted.

3 changes: 1 addition & 2 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
add_subdirectory(egl)
add_subdirectory(lib)
#add_subdirectory(tests)
add_subdirectory(tests)
70 changes: 0 additions & 70 deletions cpp/apps/BUILD

This file was deleted.

10 changes: 0 additions & 10 deletions cpp/ctypes/BUILD

This file was deleted.

Loading

0 comments on commit e101cde

Please sign in to comment.