Implement CPM support

CMakeLists.txt

@@ -66,7 +66,6 @@ endif()
 
 set(FPNG_SRC_LIST ${COMMON_SRC_LIST} 
 	src/fpng.cpp
-	src/fpng_test.cpp
 	src/lodepng.cpp
 	src/pvpngreader.cpp
 	)
@@ -81,6 +80,8 @@ install(TARGETS ${PROJECT_NAME} DESTINATION lib/${PROJECT_NAME})
 
 install(FILES ${fpng_HEADERS} DESTINATION include/${PROJECT_NAME})
 
+include_directories("src")
+
 if (APPLE)
    set(BIN_DIRECTORY "bin_osx")
 else()
@@ -89,10 +90,10 @@ endif()
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${BIN_DIRECTORY})
 
-add_executable(fpng_test ${FPNG_SRC_LIST})
+add_executable(fpng_test "src/fpng_test.cpp")
 
 if (NOT MSVC)
-   target_link_libraries(fpng_test m pthread)
+   target_link_libraries(fpng_test fpng m pthread)
 endif()
 
 install(TARGETS fpng_test DESTINATION bin)

src/basisu_miniz.h

@@ -18,6 +18,8 @@
    limitations under the License.
 */
 
+
+
 #ifndef MINIZ_HEADER_INCLUDED
 #define MINIZ_HEADER_INCLUDED
 

src/pvpngreader.cpp

@@ -13,7 +13,7 @@
 
 //#include "../transcoder/basisu.h"
 
-#define MINIZ_HEADER_FILE_ONLY
+
 #define MINIZ_NO_ZLIB_COMPATIBLE_NAMES
 #include "basisu_miniz.h"