CMakeLists.txt

Attribute changed roojspacker/.gitignore
roojspacker/.gitignore
CMakeCache.txt.tmp
CMakeCache.txt
Makefile.tmp
cmake_install.cmake.tmp
cmake_install.cmake
roojspacker/Makefile.tmp
roojspacker/cmake_install.cmake.tmp

diff --git a/CMakeCache.txt b/CMakeCache.txt
index 3264c71..277f4ff 100644 (file)
--- a/CMakeCache.txt
+++ b/CMakeCache.txt
@@ -395,7 +395,7 @@ CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_NM
 CMAKE_NM-ADVANCED:INTERNAL=1
 //number of local generators
-CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=3
+CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=2
 //ADVANCED property for variable: CMAKE_OBJCOPY
 CMAKE_OBJCOPY-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_OBJDUMP

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff54650..a50d9b0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,4 +101,4 @@ set(ROOJSPACKER_LIBRARY_NAME ${PROJECT_NAME}-${ROOJSPACKER_VERSION_API})
 
   
 add_subdirectory(roojspacker)
-add_subdirectory(bin)
\ No newline at end of file
+#add_subdirectory(bin)
\ No newline at end of file

diff --git a/cmake_install.cmake b/cmake_install.cmake
index cf014e8..0178598 100644 (file)
--- a/cmake_install.cmake
+++ b/cmake_install.cmake
@@ -40,7 +40,6 @@ endif()
 if(NOT CMAKE_INSTALL_LOCAL_ONLY)
   # Include the install script for each subdirectory.
   include("/home/alan/gitlive/roojspacker/roojspacker/cmake_install.cmake")
-  include("/home/alan/gitlive/roojspacker/bin/cmake_install.cmake")
 
 endif()