Browse Source

Uses C++11 + boost now. Adds headers to QtCreator project.

master
Joshua Moerman 11 years ago
parent
commit
0853249e2d
  1. 3
      CMakeLists.txt
  2. 0
      include/includes.hpp
  3. 0
      include/utilities.hpp
  4. 7
      wavelet/CMakeLists.txt
  5. 0
      wavelet/compressed_image.hpp
  6. 0
      wavelet/compressed_image_test.cpp

3
CMakeLists.txt

@ -1,6 +1,7 @@
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 2.6)
include_directories(SYSTEM "${PROJECT_SOURCE_DIR}/include/") include_directories(SYSTEM "${PROJECT_SOURCE_DIR}/include/")
add_definitions( -std=c++0x )
option(MultiCoreBSP "Building with Multi Core BSP" OFF) option(MultiCoreBSP "Building with Multi Core BSP" OFF)
if(MultiCoreBSP) if(MultiCoreBSP)
@ -13,7 +14,7 @@ else()
set(libs bsponmpi m) set(libs bsponmpi m)
endif() endif()
find_package(Boost REQUIRED COMPONENTS program_options) find_package(Boost REQUIRED COMPONENTS program_options filesystem system)
include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
set(libs ${libs} ${Boost_LIBRARIES}) set(libs ${libs} ${Boost_LIBRARIES})

0
include/includes.hpp

0
include/utilities.hpp

7
wavelet/CMakeLists.txt

@ -1,7 +1,12 @@
file(GLOB sources *.cpp) file(GLOB sources *.cpp)
file(GLOB headers *.hpp)
find_package(PNG REQUIRED)
include_directories(SYSTEM ${PNG_INCLUDE_DIRS})
set(libs ${libs} ${PNG_LIBRARIES})
foreach(source ${sources}) foreach(source ${sources})
get_filename_component(exec ${source} NAME_WE) get_filename_component(exec ${source} NAME_WE)
add_executable(${exec} ${source}) add_executable(${exec} ${source} ${headers})
target_link_libraries(${exec} ${libs}) target_link_libraries(${exec} ${libs})
endforeach() endforeach()

0
wavelet/compressed_image.hpp

0
wavelet/compressed_image_test.cpp