From f24478a5142419e305138b02b52bf12e9fc1bb0f Mon Sep 17 00:00:00 2001
From: Edgar <edgar@anotherfoxguy.com>
Date: Mon, 3 Sep 2018 09:55:35 +0000
Subject: [PATCH] Updated cmake

---
 CMakeLists.txt           | 34 +++++++++++++++----------
 build/CMakeLists.txt     | 54 ----------------------------------------
 build/bin/CMakeLists.txt | 22 ----------------
 conanfile.py             |  7 +++---
 4 files changed, 24 insertions(+), 93 deletions(-)
 delete mode 100644 build/CMakeLists.txt
 delete mode 100644 build/bin/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4b221c..4bbc950 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,35 +15,41 @@
 cmake_minimum_required(VERSION 2.6)
 project(moFileReader)
 
-# Set Output Directories.
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ../bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ../lib)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ../lib)
-
-
 # The main include directory
-include_directories(BEFORE ../include)
+include_directories(BEFORE ${CMAKE_SOURCE_DIR}/include)
 
-# executable build directory
-add_subdirectory(bin)
 
 # Let the user choose between static lib and dll
 # To use it, call cmake -DCOMPILE_DLL=ON
 option(COMPILE_DLL "Set this to ON if you want to compile the library as an DLL. When this is OFF, a static library is created (default)." OFF)
 
-# Dependency
-link_directories(../lib)
 
 if ( NOT COMPILE_DLL )
 
     # Static build
-    add_library(moFileReader.static STATIC ../src/moFileReader.cpp ../src/mo.cpp)
+    add_library(moFileReader.static STATIC ${CMAKE_SOURCE_DIR}/src/moFileReader.cpp ${CMAKE_SOURCE_DIR}/src/mo.cpp)
 
 else ( COMPILE_DLL )
 
     # DLL
     add_definitions(-D_USRDLL -DMOFILE_EXPORTS)
-    add_library(moFileReader SHARED ../src/moFileReader.cpp ../src/mo.cpp)
+    add_library(moFileReader SHARED ${CMAKE_SOURCE_DIR}/src/moFileReader.cpp ${CMAKE_SOURCE_DIR}/src/mo.cpp)
+
+endif ()
+
+add_executable(moReader ${CMAKE_SOURCE_DIR}/src/mo.cpp)
+
+if ( NOT COMPILE_DLL )
+
+add_definitions(-D_CONSOLE)
+add_dependencies(moReader moFileReader.static)
+target_link_libraries(moReader moFileReader.static)
+
+else ( COMPILE_DLL )
+
+add_definitions(-D_CONSOLE -DMOFILE_IMPORT)
+add_dependencies(moReader moFileReader)
+target_link_libraries(moReader moFileReader)
 
 endif ()
 
@@ -52,3 +58,5 @@ endif ()
 
 
 
+
+
diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
deleted file mode 100644
index a4b221c..0000000
--- a/build/CMakeLists.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-#-------------------------------------------------------
-# moFileReader Main Build Script
-#
-# Defined Variables:
-#   - COMPILE_DLL 
-#     - ON  : Compiles the code as a shared Library
-#     - OFF : Compiles the code as a static Library
-#   - BUILD_DEBUG
-#     - ON  : Compiles Debug-Information into the output
-#     - OFF : Optimizes the compilation with O2.
-#
-# Run cmake with -DVARNAME=ON/OFF to benefit from those
-# possible settings.
-#-------------------------------------------------------
-cmake_minimum_required(VERSION 2.6)
-project(moFileReader)
-
-# Set Output Directories.
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ../bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ../lib)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ../lib)
-
-
-# The main include directory
-include_directories(BEFORE ../include)
-
-# executable build directory
-add_subdirectory(bin)
-
-# Let the user choose between static lib and dll
-# To use it, call cmake -DCOMPILE_DLL=ON
-option(COMPILE_DLL "Set this to ON if you want to compile the library as an DLL. When this is OFF, a static library is created (default)." OFF)
-
-# Dependency
-link_directories(../lib)
-
-if ( NOT COMPILE_DLL )
-
-    # Static build
-    add_library(moFileReader.static STATIC ../src/moFileReader.cpp ../src/mo.cpp)
-
-else ( COMPILE_DLL )
-
-    # DLL
-    add_definitions(-D_USRDLL -DMOFILE_EXPORTS)
-    add_library(moFileReader SHARED ../src/moFileReader.cpp ../src/mo.cpp)
-
-endif ()
-
-
-
-
-
-
diff --git a/build/bin/CMakeLists.txt b/build/bin/CMakeLists.txt
deleted file mode 100644
index 63c3ce2..0000000
--- a/build/bin/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ../../bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ../../lib)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ../../lib)
-
-add_executable(moReader ../../src/mo.cpp)
-
-if ( NOT COMPILE_DLL )
-
-add_definitions(-D_CONSOLE)
-add_dependencies(moReader moFileReader.static)
-target_link_libraries(moReader moFileReader.static)
-
-else ( COMPILE_DLL )
-
-add_definitions(-D_CONSOLE -DMOFILE_IMPORT)
-add_dependencies(moReader moFileReader)
-target_link_libraries(moReader moFileReader)
-
-endif ()
-
-
-
diff --git a/conanfile.py b/conanfile.py
index 7a224fe..4170a81 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -11,18 +11,17 @@ class MofilereaderConan(ConanFile):
     #options = {"shared": [True, False]}
     #default_options = "shared=False"
     generators = "cmake"
+    exports_sources = "include*", "src*", "CMakeLists.txt"
 
-    def source(self):
-        self.run("git clone https://bitbucket.org/scorcher24/mofilereader.git .")
 
     def build(self):
         cmake = CMake(self)
-        cmake.configure(source_folder="build")
+        cmake.configure()
         cmake.build()
 
     def package(self):
         self.copy("*.h", dst="include", src="include")
-        self.copy("*.lib", dst="lib", src=os.path.join("..", "lib"), keep_path=False)
+        self.copy("*.lib", dst="lib", keep_path=False)
         self.copy("*.dll", dst="bin", keep_path=False)
         self.copy("*.so", dst="lib", keep_path=False)
         self.copy("*.dylib", dst="lib", keep_path=False)