Merge pull request #147 from aaron-bray/release

Configure log4plus
Kitware · Jun 30, 2017 · c667724 · c667724
2 parents 33cbeee + fe55515
commit c667724
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/CMake/External_Ceres.cmake b/CMake/External_Ceres.cmake
@@ -60,6 +60,8 @@ else()
   set(Ceres_DIR "${Ceres_ROOT}/share/Ceres" CACHE PATH "" FORCE)
 endif()
 
+
+
 file(APPEND ${fletch_CONFIG_INPUT} "
 ########################################
 # Ceres

diff --git a/CMake/External_log4cplus.cmake b/CMake/External_log4cplus.cmake
@@ -11,18 +11,18 @@ ExternalProject_Add(log4cplus
       ${COMMON_CMAKE_ARGS}
       -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
       -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+      -DUNICODE:BOOL=OFF
     )
 
 fletch_external_project_force_install(PACKAGE log4cplus)
 
-set(Log4cplus_ROOT ${fletch_BUILD_INSTALL_PREFIX} CACHE STRING "")
-set(Log4cplus_DIR "${Log4cplus_ROOT}/lib/cmake/log4cplus" CACHE PATH "" FORCE)
+set(log4cplus_ROOT ${fletch_BUILD_INSTALL_PREFIX} CACHE STRING "")
 
 file(APPEND ${fletch_CONFIG_INPUT} "
 ########################################
 # log4cplus
 ########################################
-set(Log4cplus_ROOT    @Log4cplus_ROOT@)
-set(Log4cplus_DIR     @Log4cplus_DIR@)
-set(fletch_ENABLED_Log4cplus TRUE)
+set(log4cplus_ROOT   @log4cplus_ROOT@)
+set(log4cplus_DIR    @log4cplus_ROOT@/lib/cmake/log4cplus)
+set(fletch_ENABLED_log4cplus TRUE)
 ")
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,6 +60,8 @@ else() @@
       set(Ceres_DIR "${Ceres_ROOT}/share/Ceres" CACHE PATH "" FORCE)
     endif()
     file(APPEND ${fletch_CONFIG_INPUT} "
     ########################################
     # Ceres
@@ Expand Down @@