diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2015-04-29 21:18:06 +0200 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2015-04-29 21:18:06 +0200 |
| commit | ad216d86f6573e3575e85f3a2941f6f34b5b1c0e (patch) | |
| tree | c8a0b87180cc188ff2ed8ce69101f2f7adf03efc | |
| parent | e241abc9df586cce683d6ae89e1d02c13084a10f (diff) | |
Add missing dependency in CMakeList.txt
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Model/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
4 files changed, 5 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c822dc4..4ab2346 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,5 +14,5 @@ set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}") cmake_minimum_required(VERSION 2.6) #Add source directory -add_subdirectory(src) +add_subdirectory(./src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a946644..89e46d5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,6 +12,6 @@ set_property(GLOBAL PROPERTY SFML_INCLUDE_DIR "${SFML_INCLUDE_DIR}") #Include "Includes" and "Libraries" include_directories(${SFML_INCLUDE_DIR}) -target_link_libraries(2P11 ${SFML_LIBRARIES}) +target_link_libraries(2P11 ${SFML_LIBRARIES} Model) add_subdirectory(./Model) diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt index c9cfb6e..c685c7a 100644 --- a/src/Model/CMakeLists.txt +++ b/src/Model/CMakeLists.txt @@ -1,8 +1,2 @@ -#Retrieve crypto++ libraries -get_property(SFML_LIBRARIES GLOBAL PROPERTY SFML_LIBRARIES) - -#Make CryptClass lib -add_library(Model ./Cell.cpp ./Game.cpp ./Grid.cpp) - -#Add crypto++ to CryptClass -target_link_libraries(Model ${SFML_LIBRARIES}) +#Make Model lib +add_library(Model Grid.cpp Cell.cpp Game.cpp) diff --git a/src/main.cpp b/src/main.cpp index 12f6c6d..00473f8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,7 @@ #include <iostream> #include <string> -#include "Model/Grid.hpp" +#include "./Model/Grid.hpp" int main() { |