Merge pull request #10 from lioncash/cmake

CMakeLists: Minor cleanup

CMakeLists.txt

@@ -17,12 +17,8 @@ if (NOT TARGET logvisor)
   add_subdirectory(logvisor)
 endif()
 
-file(GLOB NOD_HEADERS include/nod/*.h*)
-
 add_subdirectory(lib)
 add_subdirectory(driver)
-target_include_directories(nod PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
-install(DIRECTORY include/nod DESTINATION include)
 
 set(version_config_file "${PROJECT_BINARY_DIR}/nodConfigVersion.cmake")
 set(config_file "${PROJECT_BINARY_DIR}/nodConfig.cmake")

lib/CMakeLists.txt

@@ -1,14 +1,31 @@
 add_library(nod
-            aes.cpp
+  aes.cpp
-            sha1.c
+  sha1.c
-            DiscBase.cpp
+
-            DiscGCN.cpp
+  DirectoryEnumerator.cpp
-            DiscIOISO.cpp
+  DiscBase.cpp
-            DiscIOWBFS.cpp
+  DiscGCN.cpp
-            DiscWii.cpp
+  DiscIOISO.cpp
-            DirectoryEnumerator.cpp
+  DiscIOWBFS.cpp
-            nod.cpp
+  DiscWii.cpp
-            ${NOD_HEADERS})
+  nod.cpp
+
+  ../include/nod/aes.hpp
+  ../include/nod/DirectoryEnumerator.hpp
+  ../include/nod/DiscBase.hpp
+  ../include/nod/DiscGCN.hpp
+  ../include/nod/DiscWii.hpp
+  ../include/nod/IDiscIO.hpp
+  ../include/nod/IFileIO.hpp
+  ../include/nod/nod.hpp
+  ../include/nod/sha1.h
+  ../include/nod/Util.hpp
+)
+
+target_include_directories(nod PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
+)
+
 target_link_libraries(nod PUBLIC logvisor)
 
 if(WIN32)
@@ -29,3 +46,5 @@ install(
     ARCHIVE DESTINATION "lib"
     INCLUDES DESTINATION include  # This sets the INTERFACE_INCLUDE_DIRECTORIES property of the target.
 )
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../include/nod DESTINATION include)