Simplifies build process

yp · Jul 1, 2015 · 0318eb8 · 0318eb8
1 parent 52e4156
commit 0318eb8
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 27 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,9 +46,6 @@ set (Boost_ADDITIONAL_VERSIONS "1.42" "1.42.0")
 find_package (Boost COMPONENTS "filesystem" "system" "date_time" "program_options" "iostreams" REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
 link_directories(${Boost_LIBRARY_DIRS})
-find_package (Log4Cxx REQUIRED)
-include_directories(${Log4Cxx_INCLUDE_DIRS})
-link_directories(${Log4Cxx_LIBRARY_DIRS})
 
 set (CMAKE_CXX_FLAGS "-std=c++0x -Wall ${CMAKE_CXX_FLAGS}")
 set (CMAKE_CXX_FLAGS_DEBUG "-O0 ${CMAKE_CXX_FLAGS_DEBUG}")

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 ##############################################################
 #               CMake Project Wrapper Makefile               #
 ############################################################## 
-DEFAULT_STATUS := Debug
+DEFAULT_STATUS := Release
 
 ifndef STATUS
 STATUS:=__undefined__status__

diff --git a/src/application/CMakeLists.txt b/src/application/CMakeLists.txt
@@ -14,7 +14,7 @@ set (project_BIN ${PROJECT_NAME})
 set (project_LIBS
   ${project_base_LIB}
   ${Boost_LIBRARIES}
-  ${Log4Cxx_LIBRARIES}
+  log4cxx
   ${sat_LIBS}
 )
 

diff --git a/tools/share/cmake/FindLog4Cxx.cmake b/tools/share/cmake/FindLog4Cxx.cmake