From 07810ffd9cb4b3bed1e09a85897be3f5614835d7 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sun, 4 May 2014 22:59:32 -0700 Subject: [PATCH] Apparently these need to be at the top to work in a purely command-line (msbuild) environment --- CMakeLists.txt | 1 + Sources/Plasma/PubUtilLib/plGImage/CMakeLists.txt | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e20c18f..1c8faa28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,6 +40,7 @@ find_package(OpenAL REQUIRED) find_package(PythonLibs REQUIRED) find_package(EXPAT REQUIRED) find_package(ZLIB REQUIRED) +find_package(JPEG REQUIRED) find_package(PNG REQUIRED) find_package(Ogg REQUIRED) #TODO: Not required if we aren't building the client find_package(Vorbis REQUIRED) #TODO: Not required if we aren't building the client diff --git a/Sources/Plasma/PubUtilLib/plGImage/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plGImage/CMakeLists.txt index c37876be..50f1babd 100644 --- a/Sources/Plasma/PubUtilLib/plGImage/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/plGImage/CMakeLists.txt @@ -3,10 +3,7 @@ include_directories("../../NucleusLib/inc") include_directories("../../NucleusLib") include_directories("../../PubUtilLib") -find_package(JPEG REQUIRED) include_directories(${JPEG_INCLUDE_DIR}) - -find_package(PNG REQUIRED) include_directories(${PNG_INCLUDE_DIR}) set(plGImage_SOURCES